diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-06 20:26:39 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 20:26:39 +0100 |
| commit | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (patch) | |
| tree | 0c02c3cfff77e868d605246204add4664503b2af /drivers/net/wireless/orinoco | |
| parent | netdev: ethernet dev_alloc_skb to netdev_alloc_skb (diff) | |
| parent | rtlwifi: Convert to asynchronous firmware load (diff) | |
| download | linux-8926574c4d0055ca4c4a02d1f6b2c249d01a0621.tar.xz linux-8926574c4d0055ca4c4a02d1f6b2c249d01a0621.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
Diffstat (limited to 'drivers/net/wireless/orinoco')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_usb.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index ae8ce56670b6..f634d4582bfe 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -1754,11 +1754,6 @@ static struct usb_driver orinoco_driver = { .id_table = ezusb_table, }; -/* Can't be declared "const" or the whole __initdata section will - * become const */ -static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION - " (Manuel Estrada Sainz)"; - module_usb_driver(orinoco_driver); MODULE_AUTHOR("Manuel Estrada Sainz"); |