diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 05:59:19 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 05:59:19 +0200 |
commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /arch/arm/plat-s5p/Makefile | |
parent | sh: remove duplicated #include (diff) | |
parent | Linux 2.6.35-rc1 (diff) | |
download | linux-8fa76f7e61ef4e5bc97207143ea4e198b22487bc.tar.xz linux-8fa76f7e61ef4e5bc97207143ea4e198b22487bc.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/plat-s5p/Makefile')
-rw-r--r-- | arch/arm/plat-s5p/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index 0ec09a9c36bd..39c242bb9d58 100644 --- a/arch/arm/plat-s5p/Makefile +++ b/arch/arm/plat-s5p/Makefile @@ -16,3 +16,5 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o + |