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 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
adssphere.c
diff --git
a/arch/arm/mach-ep93xx/adssphere.c
b/arch/arm/mach-ep93xx/adssphere.c
index caf6d5154aecd9c37a5034173750d64695969401..3a1a855bfdcace3e35591a50ede18edb6f2a1ec3 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,
};