diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-29 02:01:57 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-29 02:01:57 +0100 |
| commit | efa25ffdd6a8518e963c5426f70b094a09fb2abb (patch) | |
| tree | e9d88fde205d2934165587ec4698559ba3730f0e /arch/arm/mach-exynos/platsmp.c | |
| parent | cd5f48a7acd8aa3974019360dcecc8eebf24fa67 (diff) | |
| parent | 1aa9c483d1be13831bc4e516ce4848d32ac3e944 (diff) | |
Merge tag 'samsung-cleanup-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3
Merge "Samsung 3rd cleanup for v3.15" from Kukjin Kim:
- Remove <mach/hardware.h> in mach-exynos
- Remove invalid code from <mach/hardware.h> in mach-s3c24xx
Note that this is based on previous tags/samsung-cleanup-2
* tag 'samsung-cleanup-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Remove hardware.h file
ARM: SAMSUNG: Remove hardware.h inclusion
ARM: S3C24XX: Remove invalid code from hardware.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/platsmp.c')
| -rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 8ea02f63fed9..03e5e9f94705 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -26,8 +26,6 @@ #include <asm/smp_scu.h> #include <asm/firmware.h> -#include <mach/hardware.h> - #include <plat/cpu.h> #include "common.h" |