diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-29 00:28:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-29 00:28:46 -0400 |
commit | 332e4af80d1214fbf0e263e1408fc7c5b64ecdd6 (patch) | |
tree | 7c8f8ada7ab8fc9cb2497d95e52dce4d2c4493a3 /arch/blackfin/mach-bf527/boards/ezkit.c | |
parent | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (diff) | |
parent | be0976be9148f31ee0d1997354c3e30ff8d07587 (diff) |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/ezkit.c')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 5958eecefcf1..689b69c98ee4 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -323,10 +323,15 @@ static struct platform_device smc91x_device = { | |||
323 | static struct resource dm9000_resources[] = { | 323 | static struct resource dm9000_resources[] = { |
324 | [0] = { | 324 | [0] = { |
325 | .start = 0x203FB800, | 325 | .start = 0x203FB800, |
326 | .end = 0x203FB800 + 8, | 326 | .end = 0x203FB800 + 1, |
327 | .flags = IORESOURCE_MEM, | 327 | .flags = IORESOURCE_MEM, |
328 | }, | 328 | }, |
329 | [1] = { | 329 | [1] = { |
330 | .start = 0x203FB800 + 4, | ||
331 | .end = 0x203FB800 + 5, | ||
332 | .flags = IORESOURCE_MEM, | ||
333 | }, | ||
334 | [2] = { | ||
330 | .start = IRQ_PF9, | 335 | .start = IRQ_PF9, |
331 | .end = IRQ_PF9, | 336 | .end = IRQ_PF9, |
332 | .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE), | 337 | .flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE), |