From 5f5b59dcf7bc128b9f4ec10a9e958cf8bb9c9a5a Mon Sep 17 00:00:00 2001
From: XazZ <devel@xazz.no-ip.info>
Date: Sat, 12 Jul 2008 16:37:34 +0200
Subject: [PATCH] fix Makefile (remove leftover git conflicts)

---
 Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7488541..dc55999 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ ifneq ($(KERNELRELEASE),)
 	acx-mac80211-obj-$(CONFIG_ACX_MAC80211_USB) += usb.o
 	acx-mac80211-objs := common.o pci.o usb.o $(acx-mac80211-obj-y)
 
-<<<<<<< HEAD:Makefile
 # Otherwise we were called directly from the command
 # line; invoke the kernel build system.
 # Second pass, the actual build.
@@ -39,10 +38,6 @@ else
 	PWD := $(shell pwd)
 all:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
-=======
-obj-m = acx-mac80211.o
-acx-mac80211-objs := common.o pci.o #usb.o
->>>>>>> 3e18534... New logging framework, redo:Makefile
 
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
-- 
2.11.4.GIT