diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /arch/arm/mach-pxa/ezx.c | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'arch/arm/mach-pxa/ezx.c')
| -rw-r--r-- | arch/arm/mach-pxa/ezx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index 83c56d3abacb..3e6aa33a2c7c 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c | |||
| @@ -113,6 +113,10 @@ static unsigned long ezx_pin_config[] __initdata = { | |||
| 113 | GPIO91_USB_P3_1, /* ICL_XRXD */ | 113 | GPIO91_USB_P3_1, /* ICL_XRXD */ |
| 114 | GPIO56_USB_P3_4, /* ICL_VMOUT */ | 114 | GPIO56_USB_P3_4, /* ICL_VMOUT */ |
| 115 | GPIO113_USB_P3_3, /* /ICL_VMIN */ | 115 | GPIO113_USB_P3_3, /* /ICL_VMIN */ |
| 116 | |||
| 117 | /* I2C */ | ||
| 118 | GPIO117_I2C_SCL, | ||
| 119 | GPIO118_I2C_SDA, | ||
| 116 | }; | 120 | }; |
| 117 | 121 | ||
| 118 | static void __init ezx_init(void) | 122 | static void __init ezx_init(void) |