diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 14:59:02 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 14:59:02 +0200 |
| commit | 28d250c4ed03e148ea98db6e5bb614002606adc2 (patch) | |
| tree | c0728a977cac706ba59617f712897543cb0e3f50 /arch/arm/mach-s3c24xx/Makefile | |
| parent | fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 (diff) | |
| parent | d306d08f07183fe1504257101b25b5b33d77bae9 (diff) | |
Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Samsung cleanup for v4.3
- make the following headers local
watchdog-reset, onenand-core, irq-uart, backlight,
ata-core, regs-usb-hsotg-phy, spi-core, nand-core,
fb-core and regs-srom headers
- make the following c file local
s5p-dev-mfc, dev-backlight and setup-camif c file
- remove keypad-core.h file
- drop owner assignment in pmu.c
- remove duplicated define of SLEEP_MAGIC
- make exynos5420_powerdown_conf() staic
* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: remove keypad-core header in plat-samsung
ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
ARM: SAMSUNG: local backlight header in mach-s3c64xx
ARM: SAMSUNG: local ata-core header in mach-s3c64xx
ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
ARM: SAMSUNG: local spi-core header in mach-s3c24xx
ARM: SAMSUNG: local nand-core header in mach-s3c24xx
ARM: SAMSUNG: local fb-core header in mach-s3c24xx
ARM: SAMSUNG: local regs-srom header in mach-exynos
ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos
ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx
ARM: SAMSUNG: make local setup-camif in mach-s3c24xx
ARM: EXYNOS: Drop owner assignment in pmu.c
ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC
ARM: EXYNOS: Make local function static
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c24xx/Makefile')
| -rw-r--r-- | arch/arm/mach-s3c24xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 05920c8a5764..8ac2f58a3480 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -99,3 +99,4 @@ obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o +obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o |