From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/wireless/Makefile | 3 --- 1 file changed, 3 deletions(-) diff -puN drivers/net/wireless/Makefile~git-wireless-fixup drivers/net/wireless/Makefile --- a/drivers/net/wireless/Makefile~git-wireless-fixup +++ a/drivers/net/wireless/Makefile @@ -43,10 +43,7 @@ obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o obj-$(CONFIG_USB_ZD1201) += zd1201.o -<<<<<<< HEAD/drivers/net/wireless/Makefile obj-$(CONFIG_LIBERTAS_USB) += libertas/ -======= # Drivers using Devicescape IEEE 802.11 stack (net/mac80211) obj-y += mac80211/ ->>>>>>> /drivers/net/wireless/Makefile _