diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 11:01:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 11:01:44 +0100 |
| commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
| tree | c65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/mach-u300/Makefile | |
| parent | 06099961002a813324d057a91695af7c72939da6 (diff) | |
| parent | 7666c17e2b0986a079da46122d8658544416c2cf (diff) | |
| download | linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.gz linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.bz2 linux-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.zip | |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/mach-u300/Makefile')
| -rw-r--r-- | arch/arm/mach-u300/Makefile | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile new file mode 100644 index 000000000000..24950e0df4b4 --- /dev/null +++ b/arch/arm/mach-u300/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the linux kernel, U300 machine. +# + +obj-y := core.o clock.o timer.o gpio.o padmux.o +obj-m := +obj-n := +obj- := + +obj-$(CONFIG_ARCH_U300) += u300.o +obj-$(CONFIG_MMC) += mmc.o |