| commit | 1a0c83307d8211463df27af7c70465099c4979d3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Mar 20 13:42:25 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Mar 20 13:42:25 2011 -0700 |
| tree | e1311c236744935c7770d88aa306b71a32988b7c | |
| parent | a769f4968396093d5cc1b1a86204cef579784b24 [diff] | |
| parent | 961ed183a9fd080cf306c659b8736007e44065a5 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 40fa59e..32678b6 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c
@@ -9501,7 +9501,7 @@ struct niu_parent *p; int i; - plat_dev = platform_device_register_simple("niu", niu_parent_index, + plat_dev = platform_device_register_simple("niu-board", niu_parent_index, NULL, 0); if (IS_ERR(plat_dev)) return NULL;