diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:27:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:27:34 +0100 |
| commit | f9cef506815386df4bd7e463b59e0a0984ce0355 (patch) | |
| tree | b26a202b2f0472e3ebe889012312b115917717f9 /arch/arm/plat-s5p/Makefile | |
| parent | 9ae21ca362679757786f5abe556c7943e9001426 (diff) | |
| parent | cbff3eb3e6e3c618583a7435f87c1548aa12b0ad (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
Diffstat (limited to 'arch/arm/plat-s5p/Makefile')
| -rw-r--r-- | arch/arm/plat-s5p/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index f3e917e27da8..de65238a7aef 100644 --- a/arch/arm/plat-s5p/Makefile +++ b/arch/arm/plat-s5p/Makefile @@ -18,6 +18,9 @@ obj-y += cpu.o obj-y += clock.o obj-y += irq.o obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o +obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o +obj-$(CONFIG_PM) += pm.o +obj-$(CONFIG_PM) += irq-pm.o # devices |