diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:46:42 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:46:42 +0100 |
| commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
| tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/mach-ks8695/Makefile | |
| parent | 107532920226a37e595697959b2a6a823cfa2497 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ks8695/Makefile')
| -rw-r--r-- | arch/arm/mach-ks8695/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ks8695/Makefile b/arch/arm/mach-ks8695/Makefile index 7e3e8160ed3..853efd9133c 100644 --- a/arch/arm/mach-ks8695/Makefile +++ b/arch/arm/mach-ks8695/Makefile @@ -3,7 +3,7 @@ # Makefile for KS8695 architecture support # -obj-y := cpu.o irq.o time.o gpio.o devices.o +obj-y := cpu.o irq.o time.o devices.o obj-m := obj-n := obj- := |