diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /arch/arm/mach-clps711x/Makefile | |
| parent | 9be16a03928642f944915b8c05945fd87b7a15cb (diff) | |
| parent | 50f4c001bc1534db77663592496204ceba151e97 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Minor manual fixups for gfp_t clashes.
Diffstat (limited to 'arch/arm/mach-clps711x/Makefile')
| -rw-r--r-- | arch/arm/mach-clps711x/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/Makefile b/arch/arm/mach-clps711x/Makefile index 4a197315f0cf..8a6dc1ccf8fe 100644 --- a/arch/arm/mach-clps711x/Makefile +++ b/arch/arm/mach-clps711x/Makefile | |||
| @@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o | |||
| 15 | obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o | 15 | obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o |
| 16 | obj-$(CONFIG_ARCH_EDB7211) += edb7211-arch.o edb7211-mm.o | 16 | obj-$(CONFIG_ARCH_EDB7211) += edb7211-arch.o edb7211-mm.o |
| 17 | obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o | 17 | obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o |
| 18 | obj-$(CONFIG_MACH_MP1000) += mp1000-mach.o mp1000-mm.o mp1000-seprom.o | ||
| 18 | obj-$(CONFIG_ARCH_P720T) += p720t.o | 19 | obj-$(CONFIG_ARCH_P720T) += p720t.o |
| 19 | leds-$(CONFIG_ARCH_P720T) += p720t-leds.o | 20 | leds-$(CONFIG_ARCH_P720T) += p720t-leds.o |
| 20 | obj-$(CONFIG_LEDS) += $(leds-y) | 21 | obj-$(CONFIG_LEDS) += $(leds-y) |