diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-26 01:36:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-26 01:36:46 +0200 |
| commit | 495a1b4eff1a216a3ea171ac137f1807e6555f52 (patch) | |
| tree | 72d059d6d66fac6a74df33bac2eb40dcd0ea0732 /drivers/net/wireless/rtl818x/Makefile | |
| parent | 8390p: fix build breakage (diff) | |
| parent | wireless: remove some (bogus?) 'may be used uninitialized' warnings (diff) | |
| download | linux-495a1b4eff1a216a3ea171ac137f1807e6555f52.tar.xz linux-495a1b4eff1a216a3ea171ac137f1807e6555f52.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
net/mac80211/pm.c
Diffstat (limited to 'drivers/net/wireless/rtl818x/Makefile')
| -rw-r--r-- | drivers/net/wireless/rtl818x/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl818x/Makefile b/drivers/net/wireless/rtl818x/Makefile index c113b3e69046..37e3d4db0c40 100644 --- a/drivers/net/wireless/rtl818x/Makefile +++ b/drivers/net/wireless/rtl818x/Makefile @@ -1,5 +1,5 @@ rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o -rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o +rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o rtl8187_leds.o obj-$(CONFIG_RTL8180) += rtl8180.o obj-$(CONFIG_RTL8187) += rtl8187.o |