diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 01:52:55 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 01:52:55 +0200 |
commit | 1f782fee18b39b9ad438ebbd82c2915a16c879ee (patch) | |
tree | f292930065e6c860714c134790ab8882680ac739 /arch/mips/loongson/common/Makefile | |
parent | ARM: mach-shmobile: add framebuffer support for ap4evb (diff) | |
parent | fbmem: avoid printk format warning with 32-bit resources (diff) | |
download | linux-1f782fee18b39b9ad438ebbd82c2915a16c879ee.tar.xz linux-1f782fee18b39b9ad438ebbd82c2915a16c879ee.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/loongson/common/Makefile')
-rw-r--r-- | arch/mips/loongson/common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile index 7668c4de1151..cdd2e812ba1a 100644 --- a/arch/mips/loongson/common/Makefile +++ b/arch/mips/loongson/common/Makefile @@ -4,6 +4,7 @@ obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ pci.o bonito-irq.o mem.o machtype.o platform.o +obj-$(CONFIG_GENERIC_GPIO) += gpio.o # # Serial port support |