diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:53 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:44:53 +0900 |
| commit | 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff (patch) | |
| tree | 98bb33961415f8b2d011094a6bc398943f238681 /arch/arm/mach-s5p64x0/Makefile | |
| parent | 724c35cf530651f68f5958dc02e0b49ac6661226 (diff) | |
| parent | 9af7d94f2966895b37b8ef1e0d88bd4d9e317e74 (diff) | |
Merge branch 'next-s5p64x0' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5p64x0/Makefile')
| -rw-r--r-- | arch/arm/mach-s5p64x0/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile index 2655829e6bf..ae6bf6feba8 100644 --- a/arch/arm/mach-s5p64x0/Makefile +++ b/arch/arm/mach-s5p64x0/Makefile @@ -12,9 +12,9 @@ obj- := # Core support for S5P64X0 system -obj-$(CONFIG_ARCH_S5P64X0) += cpu.o init.o clock.o dma.o +obj-$(CONFIG_ARCH_S5P64X0) += cpu.o init.o clock.o dma.o gpiolib.o obj-$(CONFIG_ARCH_S5P64X0) += setup-i2c0.o -obj-$(CONFIG_CPU_S5P6440) += clock-s5p6440.o gpio.o +obj-$(CONFIG_CPU_S5P6440) += clock-s5p6440.o obj-$(CONFIG_CPU_S5P6450) += clock-s5p6450.o # machine support |