diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /arch/arm/mach-ks8695/Makefile | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (diff) | |
| parent | 8b61f37440388ebbd2a894178fe098f2e70ab392 (diff) | |
Merge branch 'highbank/soc' into next/soc
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
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 7e3e8160ed30..853efd9133c6 100644 --- a/arch/arm/mach-ks8695/Makefile +++ b/arch/arm/mach-ks8695/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # Makefile for KS8695 architecture support | 3 | # Makefile for KS8695 architecture support |
| 4 | # | 4 | # |
| 5 | 5 | ||
| 6 | obj-y := cpu.o irq.o time.o gpio.o devices.o | 6 | obj-y := cpu.o irq.o time.o devices.o |
| 7 | obj-m := | 7 | obj-m := |
| 8 | obj-n := | 8 | obj-n := |
| 9 | obj- := | 9 | obj- := |