diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /drivers/of/unittest.c | |
parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'drivers/of/unittest.c')
-rw-r--r-- | drivers/of/unittest.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 18016341d5a9..9f71770b6226 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c | |||
@@ -979,7 +979,6 @@ static struct platform_driver unittest_driver = { | |||
979 | .remove = unittest_remove, | 979 | .remove = unittest_remove, |
980 | .driver = { | 980 | .driver = { |
981 | .name = "unittest", | 981 | .name = "unittest", |
982 | .owner = THIS_MODULE, | ||
983 | .of_match_table = of_match_ptr(unittest_match), | 982 | .of_match_table = of_match_ptr(unittest_match), |
984 | }, | 983 | }, |
985 | }; | 984 | }; |
@@ -1666,7 +1665,6 @@ static const struct i2c_device_id unittest_i2c_dev_id[] = { | |||
1666 | static struct i2c_driver unittest_i2c_dev_driver = { | 1665 | static struct i2c_driver unittest_i2c_dev_driver = { |
1667 | .driver = { | 1666 | .driver = { |
1668 | .name = "unittest-i2c-dev", | 1667 | .name = "unittest-i2c-dev", |
1669 | .owner = THIS_MODULE, | ||
1670 | }, | 1668 | }, |
1671 | .probe = unittest_i2c_dev_probe, | 1669 | .probe = unittest_i2c_dev_probe, |
1672 | .remove = unittest_i2c_dev_remove, | 1670 | .remove = unittest_i2c_dev_remove, |
@@ -1761,7 +1759,6 @@ static const struct i2c_device_id unittest_i2c_mux_id[] = { | |||
1761 | static struct i2c_driver unittest_i2c_mux_driver = { | 1759 | static struct i2c_driver unittest_i2c_mux_driver = { |
1762 | .driver = { | 1760 | .driver = { |
1763 | .name = "unittest-i2c-mux", | 1761 | .name = "unittest-i2c-mux", |
1764 | .owner = THIS_MODULE, | ||
1765 | }, | 1762 | }, |
1766 | .probe = unittest_i2c_mux_probe, | 1763 | .probe = unittest_i2c_mux_probe, |
1767 | .remove = unittest_i2c_mux_remove, | 1764 | .remove = unittest_i2c_mux_remove, |