diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:57:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:57:49 -0800 |
| commit | b5c96f89177b460ef89ecd777d5f2fefd4534d3f (patch) | |
| tree | 0cbb456cf76c98d5adfc25b65f0fca4b08d38695 /arch/arm/mach-omap2/board-zoom-peripherals.c | |
| parent | e82b1dae2a8730c89e2a30c5c28562ef066f39d9 (diff) | |
| parent | f2eeeae06a41d4f9c90f8382cc0ef1d35888d09a (diff) | |
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
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-peripherals.c')
| -rwxr-xr-x | arch/arm/mach-omap2/board-zoom-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 258794db488f..8dd277c36661 100755 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -14,7 +14,7 @@ #include <linux/input.h> #include <linux/input/matrix_keypad.h> #include <linux/gpio.h> -#include <linux/i2c/twl4030.h> +#include <linux/i2c/twl.h> #include <linux/regulator/machine.h> #include <asm/mach-types.h> |