git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-ep93xx
/
ts72xx.c
diff --git
a/arch/arm/mach-ep93xx/ts72xx.c
b/arch/arm/mach-ep93xx/ts72xx.c
index
333d259
..
ae7319e
100644
(file)
--- a/
arch/arm/mach-ep93xx/ts72xx.c
+++ b/
arch/arm/mach-ep93xx/ts72xx.c
@@
-260,7
+260,7
@@
static struct platform_device ts72xx_wdt_device = {
.resource = ts72xx_wdt_resources,
};
-static struct ep93xx_eth_data ts72xx_eth_data = {
+static struct ep93xx_eth_data
__initdata
ts72xx_eth_data = {
.phy_id = 1,
};