diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 11:26:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 11:26:51 -0700 |
| commit | 6ddc1d3413a099d903cdc75e5d93b62e3bcff751 (patch) | |
| tree | 3a7e3108f11a2ec0c7b449c8e581a6887e2b16f1 /arch/arm/mach-s3c24xx/mach-osiris.c | |
| parent | 687fb3c8a0d36c50434fe1b66c5f4fe9161e5983 (diff) | |
| parent | d9671ca923445aa870ecc34df3db01dd602d87fc (diff) | |
| download | linux-6ddc1d3413a099d903cdc75e5d93b62e3bcff751.tar.bz2 | |
Merge tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Samsung cleanup for v3.15 from Kukjin Kim:
- Use generic uncompress.h for exynos and
remove exynos <mach/uncompress.h> accordingly
(other uncompress.h files will be removed)
- move <plat/rtc-core.h> into s3c24xx <mach/rtc-core.h>
- remove unused header files
- cleanup exynos related non-DT stuffs
- use inclusion <linux/serial_s3c.h> instead of
<plat/regs-serial.h>
- remove unneeded Kconfig entries:
S3C24XX_GPIO_EXTRA64 and S3C24XX_GPIO_EXTRA128
- remove unneeded function s3c24xx_init_cpu()
- remove obsolete s3c24xx <mach/tick.h>
* tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Remove uncompress.h
ARM: debug: Use generic uncompress.h for exynos
ARM: S3C24XX: Move rtc-core.h from plat to mach
ARM: EXYNOS: Remove unused header file from pm_domains.c
ARM: SAMSUNG: Remove Exynos specific code from devs, s5p-pm-irq and pm-gpio.c
ARM: SAMSUNG: Delete unused plat/regs-serial.h header file
ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file
ARM: SAMSUNG: Remove platform dependency from samsung.S
ARM: S3C24XX: get rid of unneeded selects
ARM: SAMSUNG: remove unneeded s3c24xx_init_cpu()
ARM: SAMSUNG: remove obsolete tick.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-osiris.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-osiris.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c index f84f2a4c0c6d..a4ae4bb3666d 100644 --- a/arch/arm/mach-s3c24xx/mach-osiris.c +++ b/arch/arm/mach-s3c24xx/mach-osiris.c @@ -18,6 +18,7 @@ #include <linux/device.h> #include <linux/syscore_ops.h> #include <linux/serial_core.h> +#include <linux/serial_s3c.h> #include <linux/clk.h> #include <linux/i2c.h> #include <linux/io.h> @@ -44,7 +45,6 @@ #include <plat/cpu-freq.h> #include <plat/devs.h> #include <plat/gpio-cfg.h> -#include <plat/regs-serial.h> #include <plat/samsung-time.h> #include <mach/hardware.h> |