Signed-off-by: Christian Lamparter <[email protected]>
---
drivers/net/wireless/Kconfig | 65 --------------------------------------
drivers/net/wireless/Makefile | 4 --
drivers/net/wireless/p54/Kconfig | 63 ++++++++++++++++++++++++++++++++++++
drivers/net/wireless/p54/Makefile | 3 +
4 files changed, 68 insertions(+), 67 deletions(-)
create mode 100644 drivers/net/wireless/p54/Kconfig
create mode 100644 drivers/net/wireless/p54/Makefile
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 602beab..86323c8 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -681,70 +681,7 @@ config ADM8211
Thanks to Infineon-ADMtek for their support of this driver.
-config P54_COMMON
- tristate "Softmac Prism54 support"
- depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
- ---help---
- This is common code for isl38xx based cards.
- This module does nothing by itself - the USB/PCI frontends
- also need to be enabled in order to support any devices.
-
- These devices require softmac firmware which can be found at
- http://prism54.org/
-
- If you choose to build a module, it'll be called p54common.
-
-config P54_USB
- tristate "Prism54 USB support"
- depends on P54_COMMON && USB
- select CRC32
- ---help---
- This driver is for USB isl38xx based wireless cards.
- These are USB based adapters found in devices such as:
-
- 3COM 3CRWE254G72
- SMC 2862W-G
- Accton 802.11g WN4501 USB
- Siemens Gigaset USB
- Netgear WG121
- Netgear WG111
- Medion 40900, Roper Europe
- Shuttle PN15, Airvast WM168g, IOGear GWU513
- Linksys WUSB54G
- Linksys WUSB54G Portable
- DLink DWL-G120 Spinnaker
- DLink DWL-G122
- Belkin F5D7050 ver 1000
- Cohiba Proto board
- SMC 2862W-G version 2
- U.S. Robotics U5 802.11g Adapter
- FUJITSU E-5400 USB D1700
- Sagem XG703A
- DLink DWL-G120 Cohiba
- Spinnaker Proto board
- Linksys WUSB54AG
- Inventel UR054G
- Spinnaker DUT
-
- These devices require softmac firmware which can be found at
- http://prism54.org/
-
- If you choose to build a module, it'll be called p54usb.
-
-config P54_PCI
- tristate "Prism54 PCI support"
- depends on P54_COMMON && PCI
- ---help---
- This driver is for PCI isl38xx based wireless cards.
- This driver supports most devices that are supported by the
- fullmac prism54 driver plus many devices which are not
- supported by the fullmac driver/firmware.
-
- This driver requires softmac firmware which can be found at
- http://prism54.org/
-
- If you choose to build a module, it'll be called p54pci.
-
+source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/ath5k/Kconfig"
source "drivers/net/wireless/iwlwifi/Kconfig"
source "drivers/net/wireless/hostap/Kconfig"
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 3af665d..300fc68 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -62,8 +62,6 @@ obj-$(CONFIG_IWL3945) += iwlwifi/
obj-$(CONFIG_IWL4965) += iwlwifi/
obj-$(CONFIG_RT2X00) += rt2x00/
-obj-$(CONFIG_P54_COMMON) += p54common.o
-obj-$(CONFIG_P54_USB) += p54usb.o
-obj-$(CONFIG_P54_PCI) += p54pci.o
+obj-$(CONFIG_P54_COMMON) += p54/
obj-$(CONFIG_ATH5K) += ath5k/
diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig
new file mode 100644
index 0000000..d3469d0
--- /dev/null
+++ b/drivers/net/wireless/p54/Kconfig
@@ -0,0 +1,63 @@
+config P54_COMMON
+ tristate "Softmac Prism54 support"
+ depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
+ ---help---
+ This is common code for isl38xx based cards.
+ This module does nothing by itself - the USB/PCI frontends
+ also need to be enabled in order to support any devices.
+
+ These devices require softmac firmware which can be found at
+ http://prism54.org/
+
+ If you choose to build a module, it'll be called p54common.
+
+config P54_USB
+ tristate "Prism54 USB support"
+ depends on P54_COMMON && USB
+ select CRC32
+ ---help---
+ This driver is for USB isl38xx based wireless cards.
+ These are USB based adapters found in devices such as:
+
+ 3COM 3CRWE254G72
+ SMC 2862W-G
+ Accton 802.11g WN4501 USB
+ Siemens Gigaset USB
+ Netgear WG121
+ Netgear WG111
+ Medion 40900, Roper Europe
+ Shuttle PN15, Airvast WM168g, IOGear GWU513
+ Linksys WUSB54G
+ Linksys WUSB54G Portable
+ DLink DWL-G120 Spinnaker
+ DLink DWL-G122
+ Belkin F5D7050 ver 1000
+ Cohiba Proto board
+ SMC 2862W-G version 2
+ U.S. Robotics U5 802.11g Adapter
+ FUJITSU E-5400 USB D1700
+ Sagem XG703A
+ DLink DWL-G120 Cohiba
+ Spinnaker Proto board
+ Linksys WUSB54AG
+ Inventel UR054G
+ Spinnaker DUT
+
+ These devices require softmac firmware which can be found at
+ http://prism54.org/
+
+ If you choose to build a module, it'll be called p54usb.
+
+config P54_PCI
+ tristate "Prism54 PCI support"
+ depends on P54_COMMON && PCI
+ ---help---
+ This driver is for PCI isl38xx based wireless cards.
+ This driver supports most devices that are supported by the
+ fullmac prism54 driver plus many devices which are not
+ supported by the fullmac driver/firmware.
+
+ This driver requires softmac firmware which can be found at
+ http://prism54.org/
+
+ If you choose to build a module, it'll be called p54pci.
diff --git a/drivers/net/wireless/p54/Makefile b/drivers/net/wireless/p54/Makefile
new file mode 100644
index 0000000..4fa9ce7
--- /dev/null
+++ b/drivers/net/wireless/p54/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_P54_COMMON) += p54common.o
+obj-$(CONFIG_P54_USB) += p54usb.o
+obj-$(CONFIG_P54_PCI) += p54pci.o
> John? can you please do the git mv?
> I have attached a diff to make checkpatch.pl happy, so you don't have to do
> it. ;-)
Uh, I think you need at least a small patch that modifies the
drivers/net/wireless/{Makefile,Kconfig} as appropriate. From what I
could see, your original patch didn't even add the wireless/p54/Kconfig
into wireless/Kconfig so it wouldn't be useful?
johannes
On Sat, 2008-04-05 at 01:09 +0200, Christian Lamparter wrote:
> Signed-off-by: Christian Lamparter <[email protected]>
> ---
> drivers/net/wireless/Kconfig | 65 --------------------------------------
> drivers/net/wireless/Makefile | 4 --
> drivers/net/wireless/p54/Kconfig | 63 ++++++++++++++++++++++++++++++++++++
> drivers/net/wireless/p54/Makefile | 3 +
You can't do this in five patches, it'll break git bisect. Also, for
files that are exactly the same you might just want to ask John to do a
'git mv' instead of posting full patches.
johannes
On Saturday 05 April 2008 03:07:38 Johannes Berg wrote:
> On Sat, 2008-04-05 at 02:42 +0200, Chr wrote:
> > On Saturday 05 April 2008 02:26:07 Johannes Berg wrote:
> > > > John? can you please do the git mv?
> > > > I have attached a diff to make checkpatch.pl happy, so you don't have
> > > > to do it. ;-)
> > >
> > > Uh, I think you need at least a small patch that modifies the
> > > drivers/net/wireless/{Makefile,Kconfig} as appropriate. From what I
> > > could see, your original patch didn't even add the wireless/p54/Kconfig
> > > into wireless/Kconfig so it wouldn't be useful?
> >
> > hmmmmm, look careful! one small + ;-) it's nearly invisible.
> >
> > +source "drivers/net/wireless/p54/Kconfig"
>
> Ah, so we need this patch (5/5) and the git mv. Sorry, got confused
> because you sent some other patch :)
yes, this and p54-net2280-replace-space-with-tabs.patch as checkpatch.pl
looks really awful without it...
Regards,
Chr.
On Saturday 05 April 2008 02:26:07 Johannes Berg wrote:
> > John? can you please do the git mv?
> > I have attached a diff to make checkpatch.pl happy, so you don't have to
> > do it. ;-)
>
> Uh, I think you need at least a small patch that modifies the
> drivers/net/wireless/{Makefile,Kconfig} as appropriate. From what I
> could see, your original patch didn't even add the wireless/p54/Kconfig
> into wireless/Kconfig so it wouldn't be useful?
>
hmmmmm, look careful! one small + ;-) it's nearly invisible.
+source "drivers/net/wireless/p54/Kconfig"
Regards,
Chr
On Sat, 2008-04-05 at 02:42 +0200, Chr wrote:
> On Saturday 05 April 2008 02:26:07 Johannes Berg wrote:
> > > John? can you please do the git mv?
> > > I have attached a diff to make checkpatch.pl happy, so you don't have to
> > > do it. ;-)
> >
> > Uh, I think you need at least a small patch that modifies the
> > drivers/net/wireless/{Makefile,Kconfig} as appropriate. From what I
> > could see, your original patch didn't even add the wireless/p54/Kconfig
> > into wireless/Kconfig so it wouldn't be useful?
> >
>
> hmmmmm, look careful! one small + ;-) it's nearly invisible.
>
> +source "drivers/net/wireless/p54/Kconfig"
Ah, so we need this patch (5/5) and the git mv. Sorry, got confused
because you sent some other patch :)
johannes
On Saturday 05 April 2008 01:32:19 Johannes Berg wrote:
> On Sat, 2008-04-05 at 01:09 +0200, Christian Lamparter wrote:
> > Signed-off-by: Christian Lamparter <[email protected]>
> > ---
> > drivers/net/wireless/Kconfig | 65
> > -------------------------------------- drivers/net/wireless/Makefile
> > | 4 --
> > drivers/net/wireless/p54/Kconfig | 63
> > ++++++++++++++++++++++++++++++++++++ drivers/net/wireless/p54/Makefile |
> > 3 +
>
> You can't do this in five patches, it'll break git bisect. Also, for
> files that are exactly the same you might just want to ask John to do a
> 'git mv' instead of posting full patches.
>
hmm, git bisect skip? or concat all 5 patches into 1, apply and commit?
anyway... you're probably right!
John? can you please do the git mv?
I have attached a diff to make checkpatch.pl happy, so you don't have to do
it. ;-)
Regards,
Chr