[PATCH] compat-wireless: make patches apply again

Subsystems: the rest

STALE5607d

2 messages, 2 authors, 2011-05-11 · open the first message on its own page

[PATCH] compat-wireless: make patches apply again

From: Hauke Mehrtens <hauke@hauke-m.de>
Date: 2011-05-11 17:09:42

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/35-fix-makefile-includes.patch |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index ea5b41d..7d1ceaf 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -20,32 +20,28 @@ path the make process will search in the kernel tree for the headers.
 +ccflags-y += -I$(obj)/..
 --- a/drivers/staging/brcm80211/brcmfmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmfmac/Makefile
-@@ -35,9 +35,9 @@ ccflags-y :=			\
+@@ -35,8 +35,8 @@ ccflags-y :=			\
  ccflags-$(CONFIG_BRCMDBG)	+= -DDHD_DEBUG
  
  ccflags-y += \
 -	-Idrivers/staging/brcm80211/brcmfmac	\
--	-Idrivers/staging/brcm80211/include		\
--	-Idrivers/staging/brcm80211/util
+-	-Idrivers/staging/brcm80211/include
 +	-I$(obj)		\
-+	-I$(obj)/../include	\
-+	-I$(obj)/../util
++	-I$(obj)/../include
  
  DHDOFILES = \
  	wl_cfg80211.o \
 --- a/drivers/staging/brcm80211/brcmsmac/Makefile
 +++ b/drivers/staging/brcm80211/brcmsmac/Makefile
-@@ -23,10 +23,10 @@ ccflags-y :=				\
+@@ -23,9 +23,9 @@ ccflags-y :=				\
  	-DWL11N					\
  	-DDBAND					\
  	-DBCMNVRAMR				\
 -	-Idrivers/staging/brcm80211/brcmsmac \
 -	-Idrivers/staging/brcm80211/brcmsmac/phy \
--	-Idrivers/staging/brcm80211/util \
 -	-Idrivers/staging/brcm80211/include
 +	-I$(obj)				\
 +	-I$(obj)/phy				\
-+	-I$(obj)/../util			\
 +	-I$(obj)/../include
  
  BRCMSMAC_OFILES := \
-- 
1.7.4.1

Re: [PATCH] compat-wireless: make patches apply again

From: Luis R. Rodriguez <hidden>
Date: 2011-05-11 18:00:35

On Wed, May 11, 2011 at 10:09 AM, Hauke Mehrtens [off-list ref] wrote:
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Thanks, applied and pushed!

 Luis
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help