diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:26:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:26:54 -0400 |
| commit | 5ac12c6fe1b5fbda0d0caedb8214cde545a5737c (patch) | |
| tree | 26c7ad8f48ee82d4253a4a8c0637180aa0fb8b0d /drivers/net | |
| parent | 52a23685f37c06d0cd00eeb8f517a90de3f2c338 (diff) | |
| parent | 78d00125398f18f7354e759ba7cd544a6b07f504 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix two year old bug in early bootup asm.
[SPARC64]: Update defconfig.
[SPARC64]: Fix log message type in vio_create_one().
[SPARC64]: Tweak assertions in sun4v_build_virq().
[SPARC64]: Tweak kernel log messages in power_probe().
[SPARC64]: Fix handling of multiple vdc-port nodes.
[SPARC64]: Fix device type matching in VIO's devspec_show().
[SPARC64]: Fix MODULE_DEVICE_TABLE() specification in VDC and VNET.
[SPARC]: Add sys_fallocate() entries.
[SPARC64]: Use orderly_poweroff().
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sunvnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c index b801e3b3a11a..ef0066bab2cf 100644 --- a/drivers/net/sunvnet.c +++ b/drivers/net/sunvnet.c | |||
| @@ -1136,7 +1136,7 @@ static struct vio_device_id vnet_port_match[] = { | |||
| 1136 | }, | 1136 | }, |
| 1137 | {}, | 1137 | {}, |
| 1138 | }; | 1138 | }; |
| 1139 | MODULE_DEVICE_TABLE(vio, vnet_match); | 1139 | MODULE_DEVICE_TABLE(vio, vnet_port_match); |
| 1140 | 1140 | ||
| 1141 | static struct vio_driver vnet_port_driver = { | 1141 | static struct vio_driver vnet_port_driver = { |
| 1142 | .id_table = vnet_port_match, | 1142 | .id_table = vnet_port_match, |