diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 00:44:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 00:44:33 -0400 |
| commit | 8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 (patch) | |
| tree | e7c85eca8d55007b0a467b99820820cd40ef4963 /drivers/net | |
| parent | 826509f8110049663799bc20f2b5b6170e2f78ca (diff) | |
| parent | 8913ca1c9ccb5eb6471afd419159729eef6e2730 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ibmveth.c | 2 | ||||
| -rw-r--r-- | drivers/net/iseries_veth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index c39b0609742a..32d5fabd4b10 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -1144,7 +1144,7 @@ static void ibmveth_proc_unregister_driver(void) | |||
| 1144 | 1144 | ||
| 1145 | static struct vio_device_id ibmveth_device_table[] __devinitdata= { | 1145 | static struct vio_device_id ibmveth_device_table[] __devinitdata= { |
| 1146 | { "network", "IBM,l-lan"}, | 1146 | { "network", "IBM,l-lan"}, |
| 1147 | { 0,} | 1147 | { "", "" } |
| 1148 | }; | 1148 | }; |
| 1149 | 1149 | ||
| 1150 | MODULE_DEVICE_TABLE(vio, ibmveth_device_table); | 1150 | MODULE_DEVICE_TABLE(vio, ibmveth_device_table); |
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 55af32e9bf08..183ba97785b0 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -1370,7 +1370,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id) | |||
| 1370 | */ | 1370 | */ |
| 1371 | static struct vio_device_id veth_device_table[] __devinitdata = { | 1371 | static struct vio_device_id veth_device_table[] __devinitdata = { |
| 1372 | { "vlan", "" }, | 1372 | { "vlan", "" }, |
| 1373 | { NULL, NULL } | 1373 | { "", "" } |
| 1374 | }; | 1374 | }; |
| 1375 | MODULE_DEVICE_TABLE(vio, veth_device_table); | 1375 | MODULE_DEVICE_TABLE(vio, veth_device_table); |
| 1376 | 1376 | ||