diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 04:35:33 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 04:35:33 +0200 |
commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /drivers/net/wireless/ath/Makefile | |
parent | sh: fixup fpu.o compile order (diff) | |
parent | Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 (diff) | |
download | linux-8ace5c4698ec8da53e69095596718d5a936433de.tar.xz linux-8ace5c4698ec8da53e69095596718d5a936433de.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/net/wireless/ath/Makefile')
-rw-r--r-- | drivers/net/wireless/ath/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile index 6d711ec97ec2..0e8f528c81c0 100644 --- a/drivers/net/wireless/ath/Makefile +++ b/drivers/net/wireless/ath/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_ATH5K) += ath5k/ obj-$(CONFIG_ATH9K_HW) += ath9k/ -obj-$(CONFIG_AR9170_USB) += ar9170/ obj-$(CONFIG_CARL9170) += carl9170/ obj-$(CONFIG_ATH_COMMON) += ath.o |