diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 21:15:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 21:15:15 -0400 |
| commit | 33e2bf6aa16061bae1253514e7c32af27d2b4b31 (patch) | |
| tree | 652d13b4feea9a8f562186e7badae72d2e22fe1f /drivers/net/wireless/iwmc3200wifi/Makefile | |
| parent | e880eb6c5c9d98e389ffc0d8947f75d70785361a (diff) | |
| parent | 819bfecc4fc6b6e5a793f719a45b7146ce423b79 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/Makefile')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/Makefile b/drivers/net/wireless/iwmc3200wifi/Makefile index d34291b652d3..aeed5cd80819 100644 --- a/drivers/net/wireless/iwmc3200wifi/Makefile +++ b/drivers/net/wireless/iwmc3200wifi/Makefile | |||
| @@ -3,3 +3,6 @@ iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o | |||
| 3 | iwmc3200wifi-objs += commands.o cfg80211.o eeprom.o | 3 | iwmc3200wifi-objs += commands.o cfg80211.o eeprom.o |
| 4 | 4 | ||
| 5 | iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o | 5 | iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o |
| 6 | iwmc3200wifi-$(CONFIG_IWM_TRACING) += trace.o | ||
| 7 | |||
| 8 | CFLAGS_trace.o := -I$(src) | ||