diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-28 16:58:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-28 16:58:21 +1100 |
| commit | 3abccb31166e5768f02bf75faecc7c809fdca114 (patch) | |
| tree | 0f0fa35a6ed116aa9ff050944f8f2b799d803d03 /drivers/atm | |
| parent | 590b6b48dbf0212cfbb00c2df4ee0d168e0508b4 (diff) | |
| parent | 6df43c9b4d87b6767debdfa8318c5374415e8fc0 (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/base/Makefile
drivers/bus/omap_l3_noc.c
drivers/hwmon/ibmpowernv.c
drivers/input/keyboard/gpio_keys_polled.c
drivers/iommu/tegra-smmu.c
drivers/leds/leds-gpio.c
drivers/memory/tegra30-mc.c
drivers/mfd/syscon.c
drivers/mtd/devices/docg3.c
drivers/net/ieee802154/fakehard.c
drivers/staging/media/omap24xx/omap24xxcam.c
sound/soc/intel/sst-haswell-pcm.c
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/fore200e.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index d4725fc0395d..d5d9eafbbfcf 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -2687,7 +2687,6 @@ MODULE_DEVICE_TABLE(of, fore200e_sba_match); static struct platform_driver fore200e_sba_driver = { .driver = { .name = "fore_200e", - .owner = THIS_MODULE, .of_match_table = fore200e_sba_match, }, .probe = fore200e_sba_probe, |