diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:37:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:37:23 -0700 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-ep93xx/edb93xx.c | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-ep93xx/edb93xx.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/edb93xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index d22d67ac8b9..3884182cd36 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c @@ -74,7 +74,7 @@ static void __init edb93xx_register_flash(void) } } -static struct ep93xx_eth_data edb93xx_eth_data = { +static struct ep93xx_eth_data __initdata edb93xx_eth_data = { .phy_id = 1, }; @@ -82,7 +82,7 @@ static struct ep93xx_eth_data edb93xx_eth_data = { /************************************************************************* * EDB93xx i2c peripheral handling *************************************************************************/ -static struct i2c_gpio_platform_data edb93xx_i2c_gpio_data = { +static struct i2c_gpio_platform_data __initdata edb93xx_i2c_gpio_data = { .sda_pin = EP93XX_GPIO_LINE_EEDAT, .sda_is_open_drain = 0, .scl_pin = EP93XX_GPIO_LINE_EECLK, |