git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-ep93xx
/
adssphere.c
diff --git
a/arch/arm/mach-ep93xx/adssphere.c
b/arch/arm/mach-ep93xx/adssphere.c
index
caf6d51
..
3a1a855
100644
(file)
--- a/
arch/arm/mach-ep93xx/adssphere.c
+++ b/
arch/arm/mach-ep93xx/adssphere.c
@@
-41,7
+41,7
@@
static struct platform_device adssphere_flash = {
.resource = &adssphere_flash_resource,
};
-static struct ep93xx_eth_data adssphere_eth_data = {
+static struct ep93xx_eth_data
__initdata
adssphere_eth_data = {
.phy_id = 1,
};