diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /arch/arm/mach-ep93xx/micro9.c | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'arch/arm/mach-ep93xx/micro9.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index c33360e82868..1cc911b4efa6 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
| @@ -80,7 +80,7 @@ static void __init micro9_register_flash(void) | |||
| 80 | /************************************************************************* | 80 | /************************************************************************* |
| 81 | * Micro9 Ethernet | 81 | * Micro9 Ethernet |
| 82 | *************************************************************************/ | 82 | *************************************************************************/ |
| 83 | static struct ep93xx_eth_data micro9_eth_data = { | 83 | static struct ep93xx_eth_data __initdata micro9_eth_data = { |
| 84 | .phy_id = 0x1f, | 84 | .phy_id = 0x1f, |
| 85 | }; | 85 | }; |
| 86 | 86 | ||