aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0/Makefile
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 06:06:09 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 06:06:09 +0200
commit499ba610c2829adafbf393c2f3773d73ae4445f3 (patch)
treefae89854e0b3e704dd6410780e392901df1a6759 /arch/arm/mach-s5p64x0/Makefile
parent817ba283acf2d7b5aa073b96fd989f336fcff72a (diff)
downloadkernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.zip
kernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.tar.gz
kernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.tar.bz2
merge more graphics stuff from 3.2.72
Diffstat (limited to 'arch/arm/mach-s5p64x0/Makefile')
-rw-r--r--arch/arm/mach-s5p64x0/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile
index ae6bf6f..a1324d8 100644
--- a/arch/arm/mach-s5p64x0/Makefile
+++ b/arch/arm/mach-s5p64x0/Makefile
@@ -12,10 +12,11 @@ obj- :=
# Core support for S5P64X0 system
-obj-$(CONFIG_ARCH_S5P64X0) += cpu.o init.o clock.o dma.o gpiolib.o
-obj-$(CONFIG_ARCH_S5P64X0) += setup-i2c0.o
+obj-$(CONFIG_ARCH_S5P64X0) += cpu.o init.o clock.o dma.o
+obj-$(CONFIG_ARCH_S5P64X0) += setup-i2c0.o irq-eint.o
obj-$(CONFIG_CPU_S5P6440) += clock-s5p6440.o
obj-$(CONFIG_CPU_S5P6450) += clock-s5p6450.o
+obj-$(CONFIG_PM) += pm.o irq-pm.o
# machine support
@@ -28,3 +29,4 @@ obj-y += dev-audio.o
obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
obj-$(CONFIG_S5P64X0_SETUP_I2C1) += setup-i2c1.o
+obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP) += setup-fb-24bpp.o