git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
gesbc9312.c
diff --git
a/arch/arm/mach-ep93xx/gesbc9312.c
b/arch/arm/mach-ep93xx/gesbc9312.c
index 3da7ca816d19546af2cd6acee4c7eb92e10c00e2..a809618e9f059043b706bf25e57ffcf070dd3ff4 100644
(file)
--- a/
arch/arm/mach-ep93xx/gesbc9312.c
+++ b/
arch/arm/mach-ep93xx/gesbc9312.c
@@
-41,7
+41,7
@@
static struct platform_device gesbc9312_flash = {
.resource = &gesbc9312_flash_resource,
};
-static struct ep93xx_eth_data gesbc9312_eth_data = {
+static struct ep93xx_eth_data
__initdata
gesbc9312_eth_data = {
.phy_id = 1,
};