summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 23:25:41 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 23:25:41 +0100
commit3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch)
treea2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-lpc32xx/Makefile
parentMerge branch 'depends/omap2_dss' into next/cleanup (diff)
parentMerge branch 'depends/rmk/memory_h' into next/fixes (diff)
downloadlinux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.tar.xz
linux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.zip
Merge branch 'next/fixes' into next/cleanup
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-lpc32xx/Makefile')
-rw-r--r--arch/arm/mach-lpc32xx/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile
index a5fc5d0eeaeb..f5db805ab958 100644
--- a/arch/arm/mach-lpc32xx/Makefile
+++ b/arch/arm/mach-lpc32xx/Makefile
@@ -3,6 +3,6 @@
#
obj-y := timer.o irq.o common.o serial.o clock.o
-obj-y += gpiolib.o pm.o suspend.o
+obj-y += pm.o suspend.o
obj-y += phy3250.o