diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:57:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:57:17 -0400 |
commit | 9028780a3e6d2c3dd940e89b377765cca008b6df (patch) | |
tree | 1e72fceedcb72b65e8851d0a56586a699e09ad2e /arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |
parent | 5335a40be6867eff986a31bcd8fc82a5cb1e16bb (diff) | |
parent | e824f7836de25b1c2f659a2412d32227f1f68bcb (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits)
[netdrvr] atl1: fix build
pasemi_mac: Use local-mac-address instead of mac-address if available
pasemi_mac: PHY support
pasemi_mac: Add msglevel support and "debug" module param
pasemi_mac: Logic cleanup / rx performance improvements
pasemi_mac: Minor cleanup / define fixes
pasemi_mac: Add SKB reuse / copy-break
pasemi_mac: Timer and interrupt fixes
pasemi_mac: Abstract and fix up interrupt restart routines
pasemi_mac: Move the IRQ mapping from the PCI layer to the driver
tc35815: Remove unnecessary skb->dev assignment
drivers/net/dm9000: Convert to generic boolean
AT91RM9200 Ethernet: Fix multicast addressing
AT91RM9200 Ethernet: Support additional PHYs
PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code
sky2: re-enable 88E8056 for most motherboards
MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX
ne: MIPS: Use platform_driver for ne on RBTX49XX
ne: Add NEEDS_PORTLIST to control ISA auto-probe
ne: Misc fixes for platform driver.
...
Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to
of_get_property()) manually.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c')
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index 0f7576dfd141..a0c11efeaeeb 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -1049,3 +1049,22 @@ static int __init toshiba_rbtx4927_rtc_init(void) | |||
1049 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | 1049 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; |
1050 | } | 1050 | } |
1051 | device_initcall(toshiba_rbtx4927_rtc_init); | 1051 | device_initcall(toshiba_rbtx4927_rtc_init); |
1052 | |||
1053 | static int __init rbtx4927_ne_init(void) | ||
1054 | { | ||
1055 | static struct resource __initdata res[] = { | ||
1056 | { | ||
1057 | .start = RBTX4927_RTL_8019_BASE, | ||
1058 | .end = RBTX4927_RTL_8019_BASE + 0x20 - 1, | ||
1059 | .flags = IORESOURCE_IO, | ||
1060 | }, { | ||
1061 | .start = RBTX4927_RTL_8019_IRQ, | ||
1062 | .flags = IORESOURCE_IRQ, | ||
1063 | } | ||
1064 | }; | ||
1065 | struct platform_device *dev = | ||
1066 | platform_device_register_simple("ne", -1, | ||
1067 | res, ARRAY_SIZE(res)); | ||
1068 | return IS_ERR(dev) ? PTR_ERR(dev) : 0; | ||
1069 | } | ||
1070 | device_initcall(rbtx4927_ne_init); | ||