diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
| commit | 7dacf842dba1515f097f9efe889e497adfc258ce (patch) | |
| tree | b25b366e96e42f3049b162a266abe19a253c2da5 /drivers/staging/rtl8187se/Makefile | |
| parent | 190e8cfcb9ac7ae9bbf6b7f54450292f365727dc (diff) | |
| parent | 78a22eafad6d9c3ce5400b3226a407ea784d7ed0 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/rtl8187se/Makefile')
| -rw-r--r-- | drivers/staging/rtl8187se/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile index b395acf5a38e..e6adf91cdd2c 100644 --- a/drivers/staging/rtl8187se/Makefile +++ b/drivers/staging/rtl8187se/Makefile @@ -18,7 +18,6 @@ EXTRA_CFLAGS += -DENABLE_LPS r8187se-objs := \ r8180_core.o \ - r8180_93cx6.o \ r8180_wx.o \ r8180_rtl8225z2.o \ r8185b_init.o \ |