b43: Don't compile N-PHY code when N-PHY is disabled
authorMichael Buesch <mb@bu3sch.de>
Sun, 23 Mar 2008 00:33:58 +0000 (01:33 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 25 Mar 2008 20:41:59 +0000 (16:41 -0400)
There's no need to compile the N-PHY support code, when the
N-PHY support is disabled in Kconfig.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/Makefile
drivers/net/wireless/b43/nphy.h

index ac1329dba04581317c306791c1b5b465dd0a2dba..ae11fe4c0be674215c17ad6e98a3ce3ae6d1390d 100644 (file)
@@ -1,8 +1,8 @@
 b43-y                          += main.o
 b43-y                          += tables.o
-b43-y                          += tables_nphy.o
+b43-$(CONFIG_B43_NPHY)         += tables_nphy.o
 b43-y                          += phy.o
-b43-y                          += nphy.o
+b43-$(CONFIG_B43_NPHY)         += nphy.o
 b43-y                          += sysfs.o
 b43-y                          += xmit.o
 b43-y                          += lo.o
index 5d95118b819310adf1302118d9b0c0f76d222f66..faf46b9cbf1b135b545a2df032c5c5663477c9e2 100644 (file)
 
 struct b43_wldev;
 
+
+#ifdef CONFIG_B43_NPHY
+/* N-PHY support enabled */
+
 int b43_phy_initn(struct b43_wldev *dev);
 
 void b43_nphy_radio_turn_on(struct b43_wldev *dev);
@@ -929,4 +933,40 @@ int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel);
 void b43_nphy_xmitpower(struct b43_wldev *dev);
 void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna);
 
+
+#else /* CONFIG_B43_NPHY */
+/* N-PHY support disabled */
+
+
+static inline
+int b43_phy_initn(struct b43_wldev *dev)
+{
+       return -EOPNOTSUPP;
+}
+
+static inline
+void b43_nphy_radio_turn_on(struct b43_wldev *dev)
+{
+}
+static inline
+void b43_nphy_radio_turn_off(struct b43_wldev *dev)
+{
+}
+
+static inline
+int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)
+{
+       return -ENOSYS;
+}
+
+static inline
+void b43_nphy_xmitpower(struct b43_wldev *dev)
+{
+}
+static inline
+void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)
+{
+}
+
+#endif /* CONFIG_B43_NPHY */
 #endif /* B43_NPHY_H_ */