tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

* 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
[PATCH] libertas: build problems when partially modular

Linus Torvalds e2cd68f7 f9690f36

+1 -1
unified split
+1 -1
drivers/net/wireless/Makefile
··· 43 43 obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o 44 44 45 45 obj-$(CONFIG_USB_ZD1201) += zd1201.o 46 - obj-$(CONFIG_LIBERTAS_USB) += libertas/ 46 + obj-$(CONFIG_LIBERTAS) += libertas/ 47 47 48 48 rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o 49 49 obj-$(CONFIG_RTL8187) += rtl8187.o