Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5c96f89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP3: serial - fix bug introduced in
  mfd: twl: fix twl4030 rename for remaining driver, board files
  USB ehci: replace mach header with plat
  omap3: Allow EHCI to be built on OMAP3
parents e82b1dae f2eeeae0

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ config ARCH_OMAP2430 
config ARCH_OMAP34XX

	bool "OMAP34xx Based System"

	depends on ARCH_OMAP3

	select USB_ARCH_HAS_EHCI



config ARCH_OMAP3430

	bool "OMAP3430 support"

arch/arm/mach-omap2/board-cm-t35.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/gpio.h>



#include <linux/i2c/at24.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>



#include <asm/mach-types.h>

arch/arm/mach-omap2/board-igep0020.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/interrupt.h>



#include <linux/regulator/machine.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-omap2/board-omap3evm.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>

#include <linux/usb/otg.h>

#include <linux/smsc911x.h>

arch/arm/mach-omap2/board-omap3touchbook.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/spi/ads7846.h>



#include <linux/regulator/machine.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>