diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-25 11:08:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-25 11:08:44 -0700 |
| commit | ebe3b0e787a538638410088227e0a87e3b4b6c00 (patch) | |
| tree | d1f6d286991c244e624195790b8311ecaf8c2b3f /arch | |
| parent | ddf25dfe3a744d4e11a73e1508121f74267dda68 (diff) | |
| download | op-kernel-dev-ebe3b0e787a538638410088227e0a87e3b4b6c00.zip op-kernel-dev-ebe3b0e787a538638410088227e0a87e3b4b6c00.tar.gz | |
ARM: OMAP1: Misc clean-up
Remove unnecessary Kconfig line and allow compile of MBOX_FWK.
Also allow building USB on Nokia 770.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap1/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index cd8de89..55ecc01 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -46,7 +46,6 @@ config MACH_OMAP_H2 config MACH_OMAP_H3 bool "TI H3 Support" depends on ARCH_OMAP1 && ARCH_OMAP16XX -# select GPIOEXPANDER_OMAP help TI OMAP 1710 H3 board support. Say Y here if you have such a board. diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 1bda8f5..6867cd3 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -13,6 +13,10 @@ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management obj-$(CONFIG_PM) += pm.o sleep.o +# DSP +obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o +mailbox_mach-objs := mailbox.o + led-y := leds.o # Specific board support diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index d1ed136..8780ca6 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -35,6 +35,7 @@ #include <mach/omapfb.h> #include <mach/lcd_mipid.h> #include <mach/mmc.h> +#include <mach/usb.h> #define ADS7846_PENDOWN_GPIO 15 |
