diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 08:43:00 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 08:43:00 -0700 |
commit | e3c55d406bd8df1a878546002c93db90c42be10c (patch) | |
tree | efb0ba2707c95fd7166cf1b76887c43c977e37dd /drivers/staging/wlags49_h2/wl_cs.c | |
parent | 4d6e482675f13e33599fc3d18fc723959be0a9b6 (diff) | |
parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) |
Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were
committed through other trees.
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_cs.c')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_cs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c index b55dc43a1d1..a458705a379 100644 --- a/drivers/staging/wlags49_h2/wl_cs.c +++ b/drivers/staging/wlags49_h2/wl_cs.c @@ -99,7 +99,6 @@ #include <wl_main.h> #include <wl_netdev.h> #include <wl_cs.h> -#include <wl_sysfs.h> /******************************************************************************* @@ -178,7 +177,6 @@ static void wl_adapter_detach(struct pcmcia_device *link) wl_adapter_release(link); if (dev) { - unregister_wlags_sysfs(dev); unregister_netdev(dev); wl_device_dealloc(dev); } @@ -265,8 +263,6 @@ int wl_adapter_insert(struct pcmcia_device *link) goto failed; } - register_wlags_sysfs(dev); - printk(KERN_INFO "%s: Wireless, io_addr %#03lx, irq %d, mac_address" " %pM\n", dev->name, dev->base_addr, dev->irq, dev->dev_addr); |