diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /arch/arm/mach-pxa/Makefile | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 0d213ec58b1c..30936e40fea6 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
| @@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_E750) += e750_lcd.o | |||
| 45 | obj-$(CONFIG_MACH_E400) += e400_lcd.o | 45 | obj-$(CONFIG_MACH_E400) += e400_lcd.o |
| 46 | obj-$(CONFIG_MACH_E800) += e800_lcd.o | 46 | obj-$(CONFIG_MACH_E800) += e800_lcd.o |
| 47 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o | 47 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o |
| 48 | obj-$(CONFIG_MACH_PALMZ72) += palmz72.o | ||
| 48 | 49 | ||
| 49 | ifeq ($(CONFIG_MACH_ZYLONITE),y) | 50 | ifeq ($(CONFIG_MACH_ZYLONITE),y) |
| 50 | obj-y += zylonite.o | 51 | obj-y += zylonite.o |