diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /arch/arm/mach-omap1/include/mach/smp.h | |
parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) |
Merge branch 'next/cleanup' into HEAD
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/smp.h')
-rw-r--r-- | arch/arm/mach-omap1/include/mach/smp.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/include/mach/smp.h b/arch/arm/mach-omap1/include/mach/smp.h deleted file mode 100644 index 80a371c06e59..000000000000 --- a/arch/arm/mach-omap1/include/mach/smp.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * arch/arm/mach-omap1/include/mach/smp.h - */ - -#include <plat/smp.h> |