diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 07:16:02 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 07:16:02 +0100 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/arm/mach-omap2/board-zoom-peripherals.c | |
| parent | sh: Ensure all PG_dcache_dirty pages are written back. (diff) | |
| parent | serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx. (diff) | |
| download | linux-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.xz linux-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.zip | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
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> |