瀏覽代碼

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>
Tony Lindgren 16 年之前
父節點
當前提交
ebe3b0e787
共有 3 個文件被更改,包括 5 次插入1 次删除
  1. 0 1
      arch/arm/mach-omap1/Kconfig
  2. 4 0
      arch/arm/mach-omap1/Makefile
  3. 1 0
      arch/arm/mach-omap1/board-nokia770.c

+ 0 - 1
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.

+ 4 - 0
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

+ 1 - 0
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