Skip to contentSkip to conversation

2.6.16-rc1-mm4

PATCH Applied Gabriel C. 6 participants 15 messages Jan 30, 2006 – Feb 5, 2006

Subsystems (3)
lore
Share & tools
lore

Gabriel C.

author
#0 lore raw

Hello,

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
drivers/built-in.o: In function acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6cd74): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_s_configure_debug': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_interrogate_debug': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_cmd_start_scan': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function `acx_s_init_max_probe_response_template':common.c:(.text+0x6dbfc):
undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_init_max_tim_template':common.c:(.text+0x6dc3d): undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o:common.c:(.text+0x6dc7b): more undefined references to acxusb_s_issue_cmd_timeo_debug' follow drivers/built-in.o: In function acx_e_read_proc_phy':common.c:(.text+0x6e2b2): undefined reference to acxusb_s_read_phy_reg' drivers/built-in.o: In function acx_l_transmit_deauthen':common.c:(.text+0x6e329): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6e33b): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x6e3d6): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_i_start_xmit': undefined reference to acxusb_l_alloc_tx' drivers/built-in.o: In function acx_i_start_xmit': undefined reference to acxusb_l_get_txbuf' drivers/built-in.o: In function acx_i_start_xmit': undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_l_transmit_assoc_req':common.c:(.text+0x6e5be): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6e5d5): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x6e772): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_s_cmd_join_bssid':common.c:(.text+0x6eaa2): undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_read_phy_reg' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_write_phy_reg' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function acx_s_update_card_settings': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function `acx_e_after_interrupt_task':common.c:(.text+0x6ffc8): undefined reference to
acxusb_s_issue_cmd_timeo_debug' :common.c:(.text+0x6ffe5): undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o:common.c:(.text+0x6fffe): more undefined references to acxusb_s_issue_cmd_timeo_debug' follow drivers/built-in.o: In function acx_l_process_authen':common.c:(.text+0x7096b): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x70982): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x70a68): undefined reference to acxusb_l_tx_data' :common.c:(.text+0x70ac5): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x70adc): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x70c23): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x70c38): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x70cb3): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_l_process_mgmt_frame':common.c:(.text+0x70fc9): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x70fe0): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x71252): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x71269): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x71362): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_l_process_rxbuf': undefined reference to acxusb_l_alloc_tx' drivers/built-in.o: In function acx_l_process_rxbuf': undefined reference to acxusb_l_get_txbuf' drivers/built-in.o: In function acx_l_process_rxbuf': undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function sandisk_set_iobase':hostap_cs.c:(.text+0x801ad): undefined reference to pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x801f3):
undefined reference to pcmcia_access_configuration_register' drivers/built-in.o: In function prism2_pccard_cor_sreset':hostap_cs.c:(.text+0x80254): undefined reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80289):
undefined reference to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80325):
undefined reference to pcmcia_access_configuration_register' drivers/built-in.o:hostap_cs.c:(.text+0x80c4b): more undefined references to pcmcia_access_configuration_register' follow drivers/built-in.o: In function prism2_release':hostap_cs.c:(.text+0x849c7): undefined reference to pcmcia_disable_device' drivers/built-in.o: In function hostap_cs_probe':hostap_cs.c:(.text+0x84d53): undefined reference to pccard_get_first_tuple' :hostap_cs.c:(.text+0x84d6d): undefined reference to `pccard_get_tuple_data' :hostap_cs.c:(.text+0x84d86):
undefined reference to
pccard_parse_tuple' :hostap_cs.c:(.text+0x84dba): undefined reference to pcmcia_get_configuration_info' :hostap_cs.c:(.text+0x84de5):
undefined reference to
pccard_get_first_tuple' :hostap_cs.c:(.text+0x84e06): undefined reference to pccard_get_tuple_data' :hostap_cs.c:(.text+0x84e2b):
undefined reference to
pccard_parse_tuple' :hostap_cs.c:(.text+0x85087): undefined reference to pcmcia_request_io' :hostap_cs.c:(.text+0x850a9): undefined reference to cs_error' :hostap_cs.c:(.text+0x850c7): undefined reference to pccard_get_next_tuple' :hostap_cs.c:(.text+0x85885):
undefined reference to
pcmcia_request_irq' :hostap_cs.c:(.text+0x858ab): undefined reference to pcmcia_request_configuration' :hostap_cs.c:(.text+0x85a34):
undefined reference to
pccard_get_first_tuple' :hostap_cs.c:(.text+0x85a4a): undefined reference to pccard_get_tuple_data' :hostap_cs.c:(.text+0x85a5b):
undefined reference to
pccard_parse_tuple' :hostap_cs.c:(.text+0x85a89): undefined reference to pccard_get_first_tuple' :hostap_cs.c:(.text+0x85a9f): undefined reference to `pccard_get_tuple_data' :hostap_cs.c:(.text+0x85ab0):
undefined reference to
pccard_parse_tuple' :hostap_cs.c:(.text+0x85b11): undefined reference to pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x85bac):
undefined reference to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x85d04):
undefined reference to cs_error' drivers/built-in.o: In function init_prism2_pccard':hostap_cs.c:(.init.text+0x6dee): undefined reference to pcmcia_register_driver' drivers/built-in.o: In function exit_prism2_pccard':hostap_cs.c:(.exit.text+0x51d): undefined reference to `pcmcia_unregister_driver' make: *** [.tmp_vmlinux1] Error 1

Gnu C                  4.0.2
Gnu make               3.80
binutils               2.16.91.0.5
util-linux             2.12r
mount                  2.12r
module-init-tools      3.2.2
e2fsprogs              1.38
jfsutils               1.1.10
reiserfsprogs          3.6.19
reiser4progs           1.0.5
xfsprogs               2.7.11
quota-tools            3.13.
PPP                    2.4.3
nfs-utils              1.0.7
Linux C Library        2.3.6
Dynamic linker (ldd)   2.3.6
Linux C++ Library      6.0.6
Procps                 3.2.6
Net-tools              1.60
Kbd                    1.12
Sh-utils               5.2.1
udev                   082

Please CC me I'm not subscribed to the list

Gabriel

#1 lore raw

2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 1 line · Gabriel C.

Hello,

Hi Gabriel,

Quoted 13 lines

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
drivers/built-in.o: In function acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6cd74): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_s_configure_debug': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function [many more]
...

Thanks for your report.

@Denis:
The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.

Quoted 1 line

Gabriel

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#2 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 20 lines · Adrian Bunk
Quoted 1 line · Gabriel C.

Hello,

Hi Gabriel,

Quoted 13 lines

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
drivers/built-in.o: In function acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6cd74): undefined reference to acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_s_configure_debug': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function [many more]
...

Quoted 4 lines

Thanks for your report.

@Denis:
The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.

Thanks, will test/fix ASAP.

Gabriel, please send me your .config
--
vda

author
#3 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 22 lines · On Tue, 31 Jan 2006 08:10:32 +0200 Denis Vlasenko <[email protected]> wrote:
Quoted 21 lines · Adrian Bunk
Quoted 1 line · Gabriel C.

Hello,

Hi Gabriel,

Quoted 14 lines

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
drivers/built-in.o: In function acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6cd74):
undefined reference to
acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_s_configure_debug': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function [many more]
...

Quoted 8 lines
Quoted 4 lines

Thanks for your report.

@Denis:
The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.

Thanks, will test/fix ASAP.

Gabriel, please send me your .config

Hi Denis,

config is attached.

Quoted 2 lines

--
vda

Gabriel

#4 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 15 lines · Gabriel C.
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
drivers/built-in.o: In function acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference to acxusb_l_alloc_tx' :common.c:(.text+0x6cd74):
undefined reference to
acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference to acxusb_l_tx_data' drivers/built-in.o: In function acx_s_configure_debug': undefined reference to acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function [many more]
...

Quoted 6 lines
Quoted 6 lines
Quoted 4 lines

Thanks for your report.

@Denis:
The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.

Thanks, will test/fix ASAP.

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today. --
vda

drivers/net/wireless/tiacx/acx_struct.h renamed from drivers/net/wireless/tiacx.org/acx_struct.h +4 -0
diff -urpN linux-2.6.16-rc1-mm4.org/drivers/net/wireless/tiacx.org/acx_struct.h linux-2.6.16-rc1-mm4.org/drivers/net/wireless/tiacx/acx_struct.h
@@ -121,6 +121,10 @@ enum { acx_debug = 0 };
 #define DEVTYPE_PCI		0
 #define DEVTYPE_USB		1
 
+#if !defined(CONFIG_ACX_PCI) && !defined(CONFIG_ACX_USB)
+#error Driver must include PCI and/or USB support. You selected neither.
+#endif
+
 #if defined(CONFIG_ACX_PCI)
  #if !defined(CONFIG_ACX_USB)
   #define IS_PCI(priv)	1
#5 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 8 lines · Denis Vlasenko

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today.

Is there any way to move this into a Kconfig file? That seems nicer than having #ifdefs in source code to check for a configuration error.

John

P.S. Please post any patches with formatting according to kernel conventions:

http://linux.yyz.us/patch-format.html

Signature · 2 lines
John W. Linville
[email protected]
#6 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 6 lines · John W. Linville
Quoted 4 lines · Denis Vlasenko

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

Quoted 7 lines
Quoted 4 lines

This won't fly. You must select at least one.

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today.

Is there any way to move this into a Kconfig file? That seems nicer than having #ifdefs in source code to check for a configuration error.

Can't think of any at the moment.
--
vda

#7 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 12 lines · On Tue, 31 Jan 2006 16:58:09 +0200 Denis Vlasenko <[email protected]> wrote:
Quoted 11 lines · John W. Linville
Quoted 8 lines · Denis Vlasenko

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today.

Quoted 8 lines
Quoted 3 lines

Is there any way to move this into a Kconfig file? That seems nicer than having #ifdefs in source code to check for a configuration error.

Can't think of any at the moment.
--
vda

I'm not a kernel hacker :-) and mabye I'm wrong but why not auto select ACX_{PCI,USB} ?

Gabriel

#8 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 3 lines · Gabriel C.

I'm not a kernel hacker :-) and mabye I'm wrong but why not auto select ACX_{PCI,USB} ?

They can still be both unselected, and that's where the problem lies.

Would it work if you added '&& (ACX_USB || ACX_PCI)' to the end of the 'depends' line, or would that just make it unselectable?

cmn

Signature · 3 lines
Carlos Martín       http://www.cmartin.tk

"Erdbeben? Sicherlich etwas, das mit Erdberen zu tun hat." -- me, paraphrased
#9 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

In reply to Denis Vlasenko
Quoted 9 lines · Denis Vlasenko
Quoted 8 lines · John W. Linville
Quoted 6 lines · Denis Vlasenko

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today.

Is there any way to move this into a Kconfig file? That seems nicer than having #ifdefs in source code to check for a configuration error.

Can't think of any at the moment.

There are two possible solutions ("offer" means "is user visible"):
- only offer ACX and always build ACX_PCI/ACX_USB depending on the availability of PCI/USB
- only offer ACX_PCI and ACX_USB which select ACX

If you tell me which you prefer I can send a patch.

Quoted 1 line

vda

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#10 lore raw

Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

Quoted 12 lines · Adrian Bunk
Quoted 12 lines
Quoted 11 lines
Quoted 8 lines

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today.

Is there any way to move this into a Kconfig file? That seems nicer than having #ifdefs in source code to check for a configuration error.

Quoted 8 lines
Quoted 1 line

Can't think of any at the moment.

There are two possible solutions ("offer" means "is user visible"):
- only offer ACX and always build ACX_PCI/ACX_USB depending on the availability of PCI/USB
- only offer ACX_PCI and ACX_USB which select ACX

If you tell me which you prefer I can send a patch.

Second one sounds okay to me.
--
vda

#11 lore raw

PATCH 1/1 let only ACX_PCI/ACX_USB be user-visible and select ACX accordingly

Quoted 15 lines · Denis Vlasenko
Quoted 14 lines · Adrian Bunk
Quoted 13 lines
Quoted 11 lines
Quoted 8 lines

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Attached patch will check for this and #error out. Andrew, do not apply to -mm, I'll send you bigger update today.

Is there any way to move this into a Kconfig file? That seems nicer than having #ifdefs in source code to check for a configuration error.

Can't think of any at the moment.

Quoted 8 lines
Quoted 6 lines

There are two possible solutions ("offer" means "is user visible"):
- only offer ACX and always build ACX_PCI/ACX_USB depending on the availability of PCI/USB
- only offer ACX_PCI and ACX_USB which select ACX

If you tell me which you prefer I can send a patch.

Second one sounds okay to me.

The patch is below.

I've promised a bit too much, there's one small problem in this patch:

If the user says y to one option and m to the other, the driver is built statically supporting both.

Unfortunately, I don't see any reasonable way to implement this better (but I do still prefer this solution over the #error).

Quoted 1 line

vda

cu
Adrian

<-- snip -->

Let only ACX_PCI/ACX_USB be user-visible and select ACX accordingly.

---

 drivers/net/wireless/tiacx/Kconfig      |   43 +++++++++++++-----------
 drivers/net/wireless/tiacx/Makefile     |    4 +-
 drivers/net/wireless/tiacx/acx_struct.h |   12 ++----
 drivers/net/wireless/tiacx/common.c     |    8 ++--
 4 files changed, 34 insertions(+), 33 deletions(-)
drivers/net/wireless/tiacx/Kconfig renamed from drivers/net/wireless/tiacx/Kconfig.old +24 -19
@@ -1,25 +1,18 @@
 config ACX
-	tristate "TI acx100/acx111 802.11b/g wireless chipsets"
-	depends on NET_RADIO && EXPERIMENTAL && (USB || PCI)
+	tristate
 	select FW_LOADER
+
+config ACX_PCI
+	tristate "TI acx100/acx111 802.11b/g PCI wireless chipsets"
+	depends on NET_RADIO && EXPERIMENTAL && PCI && (USB || ACX_USB=n)
+	select ACX
+	select ACX_PCI_BOOL
 	---help---
-	A driver for 802.11b/g wireless cards based on
-	Texas Instruments acx100 and acx111 chipsets.
+	Include support for PCI and CardBus 802.11b/g wireless cards
+	based on Texas Instruments acx100 and acx111 chipsets.
 
 	This driver supports Host AP mode that allows
 	your computer to act as an IEEE 802.11 access point.
-	This driver is new and experimental.
-
-	Texas Instruments did not take part in development of this driver
-	in any way, shape or form.
-
-	The driver can be compiled as a module and will be named "acx".
-
-config ACX_PCI
-	bool "TI acx100/acx111 802.11b/g PCI"
-	depends on ACX && PCI
-	---help---
-	Include PCI and CardBus support in acx.
 
 	acx chipsets need their firmware loaded at startup.
 	You will need to provide a firmware image via hotplug.
@@ -44,11 +37,20 @@
 	Firmware files are not covered by GPL and are not distributed
 	with this driver for legal reasons.
 
+config ACX_PCI_BOOL
+	bool
+
 config ACX_USB
-	bool "TI acx100/acx111 802.11b/g USB"
-	depends on ACX && (USB=y || USB=ACX)
+	tristate "TI acx100/acx111 802.11b/g USB wireless chipsets"
+	depends on NET_RADIO && EXPERIMENTAL && USB
+	select ACX
+	select ACX_USB_BOOL
 	---help---
-	Include USB support in acx.
+	Include support for USB 802.11b/g wireless cards
+	based on Texas Instruments acx100 and acx111 chipsets.
+
+	This driver supports Host AP mode that allows
+	your computer to act as an IEEE 802.11 access point.
 
 	There is only one currently known device in this category,
 	D-Link DWL-120+, but newer devices seem to be on the horizon.
@@ -61,3 +63,6 @@
 
 	Firmware files are not covered by GPL and are not distributed
 	with this driver for legal reasons.
+
+config ACX_USB_BOOL
+	bool
drivers/net/wireless/tiacx/Makefile renamed from drivers/net/wireless/tiacx/Makefile.old +2 -2
@@ -1,6 +1,6 @@
 obj-$(CONFIG_ACX) += acx.o
 
-acx-obj-$(CONFIG_ACX_PCI) += pci.o
-acx-obj-$(CONFIG_ACX_USB) += usb.o
+acx-obj-$(CONFIG_ACX_PCI_BOOL) += pci.o
+acx-obj-$(CONFIG_ACX_USB_BOOL) += usb.o
 
 acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
drivers/net/wireless/tiacx/acx_struct.h renamed from drivers/net/wireless/tiacx/acx_struct.h.old +4 -8
@@ -105,12 +105,8 @@
 #define DEVTYPE_PCI		0
 #define DEVTYPE_USB		1
 
-#if !defined(CONFIG_ACX_PCI) && !defined(CONFIG_ACX_USB)
-#error Driver must include PCI and/or USB support. You selected neither.
-#endif
-
-#if defined(CONFIG_ACX_PCI)
- #if !defined(CONFIG_ACX_USB)
+#if defined(CONFIG_ACX_PCI_BOOL)
+ #if !defined(CONFIG_ACX_USB_BOOL)
   #define IS_PCI(adev)	1
  #else
   #define IS_PCI(adev)	((adev)->dev_type == DEVTYPE_PCI)
@@ -119,8 +115,8 @@
  #define IS_PCI(adev)	0
 #endif
 
-#if defined(CONFIG_ACX_USB)
- #if !defined(CONFIG_ACX_PCI)
+#if defined(CONFIG_ACX_USB_BOOL)
+ #if !defined(CONFIG_ACX_PCI_BOOL)
   #define IS_USB(adev)	1
  #else
   #define IS_USB(adev)	((adev)->dev_type == DEVTYPE_USB)
drivers/net/wireless/tiacx/common.c renamed from drivers/net/wireless/tiacx/common.c.old +4 -4
@@ -6853,12 +6853,12 @@
 		"recommended, visit http://acx100.sf.net in case "
 		"of further questions/discussion\n");
 
-#if defined(CONFIG_ACX_PCI)
+#if defined(CONFIG_ACX_PCI_BOOL)
 	r1 = acxpci_e_init_module();
 #else
 	r1 = -EINVAL;
 #endif
-#if defined(CONFIG_ACX_USB)
+#if defined(CONFIG_ACX_USB_BOOL)
 	r2 = acxusb_e_init_module();
 #else
 	r2 = -EINVAL;
@@ -6872,10 +6872,10 @@
 static void __exit
 acx_e_cleanup_module(void)
 {
-#if defined(CONFIG_ACX_PCI)
+#if defined(CONFIG_ACX_PCI_BOOL)
 	acxpci_e_cleanup_module();
 #endif
-#if defined(CONFIG_ACX_USB)
+#if defined(CONFIG_ACX_USB_BOOL)
 	acxusb_e_cleanup_module();
 #endif
 }
#12 lore raw

PATCH 1/1 PCMCIA=m, HOSTAP_CS=y is not a legal configuration

In reply to Gabriel C.
Quoted 1 line · Gabriel C.

Hello,

Hallo Gabriel,

Quoted 17 lines

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
...
sandisk_set_iobase':hostap_cs.c:(.text+0x801ad): undefined reference to pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x801f3):
undefined reference to pcmcia_access_configuration_register' drivers/built-in.o: In function prism2_pccard_cor_sreset':hostap_cs.c:(.text+0x80254): undefined reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80289):
undefined reference to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80325):
undefined reference to `pcmcia_access_configuration_register' [more errors]
...

thanks for your report, a patch is below.

Quoted 1 line

Gabriel

cu
Adrian

<-- snip -->

CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile.

Reported by "Gabriel C." <[email protected]>.

drivers/net/wireless/hostap/Kconfig renamed from drivers/net/wireless/hostap/Kconfig.old +1 -1
@@ -75,7 +75,7 @@
 
 config HOSTAP_CS
 	tristate "Host AP driver for Prism2/2.5/3 PC Cards"
-	depends on PCMCIA!=n && HOSTAP
+	depends on PCMCIA && HOSTAP
 	---help---
 	Host AP driver's version for Prism2/2.5/3 PC Cards.
 
author
#13 lore raw

Re: [2.6 patch] PCMCIA=m, HOSTAP_CS=y is not a legal configuration

Quoted 49 lines · On Mon, 30 Jan 2006 19:23:17 +0100 Adrian Bunk <[email protected]> wrote:
Quoted 1 line · Gabriel C.

Hello,

Hallo Gabriel,

Quoted 18 lines

I got this compile error with 2.6.16-rc1-mm4 , config attached.

LD .tmp_vmlinux1
...
`sandisk_set_iobase':hostap_cs.c:(.text+0x801ad): undefined reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x801f3):
undefined reference to pcmcia_access_configuration_register' drivers/built-in.o: In function prism2_pccard_cor_sreset':hostap_cs.c:(.text+0x80254): undefined reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80289):
undefined reference to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80325):
undefined reference to `pcmcia_access_configuration_register' [more errors]
...

thanks for your report, a patch is below.

Quoted 1 line

Gabriel

cu
Adrian

<-- snip -->

CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile.

Reported by "Gabriel C." <[email protected]>.

---
linux-2.6.16-rc1-mm4/drivers/net/wireless/hostap/Kconfig.old

2006-01-30 19:00:44.000000000 +0100 +++
linux-2.6.16-rc1-mm4/drivers/net/wireless/hostap/Kconfig
2006-01-30 19:01:04.000000000 +0100 @@ -75,7 +75,7 @@ config HOSTAP_CS

drivers/net/wireless/hostap/Kconfig line 80

Quoted 5 lines
drivers/net/wireless/hostap/Kconfig renamed from drivers/net/wireless/hostap/Kconfig.old +1 -1
 	tristate "Host AP driver for Prism2/2.5/3 PC Cards"
-	depends on PCMCIA!=n && HOSTAP
+	depends on PCMCIA && HOSTAP
 	---help---
 	Host AP driver's version for Prism2/2.5/3 PC Cards.

Hi Adrian,

Your patch works fine, thanks :)

Gabriel