Merge branch 'linus' into x86/urgent
[linux-2.6] / drivers / net / wireless / wl12xx / Makefile
1 wl12xx-objs             = main.o spi.o event.o tx.o rx.o \
2                           ps.o cmd.o acx.o boot.o init.o wl1251.o \
3                           debugfs.o
4 obj-$(CONFIG_WL12XX)    += wl12xx.o