[PATCH v2 01/22] Staging: cx25821: Makefile:cleaned up makefile cflag lines

[PATCH v2 01/22] Staging: cx25821: Makefile:cleaned up makefile cflag lines

[Tracey Dent]

changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/cx25821/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/cx25821/Makefile b/drivers/staging/cx25821/Makefile
index d0eb16e..2f1c73e 100644
--- a/drivers/staging/cx25821/Makefile
+++ b/drivers/staging/cx25821/Makefile
@@ -7,7 +7,7 @@ cx25821-objs   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
 obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
 
-EXTRA_CFLAGS += -Idrivers/media/video
-EXTRA_CFLAGS += -Idrivers/media/common/tuners
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+ccflags-y := -Idrivers/media/video
+ccflags-y := -Idrivers/media/common/tuners
+ccflags-y := -Idrivers/media/dvb/dvb-core
+ccflags-y := -Idrivers/media/dvb/frontends
-- 
1.7.3

[PATCH v2 02/22] Staging: cxlel: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use the proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/cxt1e1/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/cxt1e1/Makefile b/drivers/staging/cxt1e1/Makefile
index 10020d7..451f59f 100644
--- a/drivers/staging/cxt1e1/Makefile
+++ b/drivers/staging/cxt1e1/Makefile
@@ -1,8 +1,8 @@
 obj-$(CONFIG_CXT1E1)	+= cxt1e1.o
 
-EXTRA_CFLAGS += -DSBE_PMCC4_ENABLE
-EXTRA_CFLAGS += -DSBE_ISR_TASKLET
-EXTRA_CFLAGS += -DSBE_INCLUDE_SYMBOLS
+ccflags-y := -DSBE_PMCC4_ENABLE
+ccflags-y := -DSBE_ISR_TASKLET
+ccflags-y := -DSBE_INCLUDE_SYMBOLS
 
 cxt1e1-objs += 	\
   ossiRelease.o 	\
-- 
1.7.3

[PATCH v2 03/22] Staging: dream: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use the proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/dream/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/dream/Makefile b/drivers/staging/dream/Makefile
index fbea0ab..87de1a5 100644
--- a/drivers/staging/dream/Makefile
+++ b/drivers/staging/dream/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS=-Idrivers/staging/dream/include
+ccflags-y:=-Idrivers/staging/dream/include
 obj-$(CONFIG_MSM_ADSP)		+= qdsp5/
 obj-$(CONFIG_MSM_CAMERA)	+= camera/
 obj-$(CONFIG_INPUT_GPIO)	+= gpio_axis.o gpio_event.o gpio_input.o gpio_matrix.o gpio_output.o
-- 
1.7.3

[PATCH v2 04/22] Staging: dream: camera: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use the proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/dream/camera/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/dream/camera/Makefile b/drivers/staging/dream/camera/Makefile
index db228d7..03711dc 100644
--- a/drivers/staging/dream/camera/Makefile
+++ b/drivers/staging/dream/camera/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS=-Idrivers/staging/dream/include
+ccflags-y:=-Idrivers/staging/dream/include
 obj-$(CONFIG_MT9T013) += mt9t013.o mt9t013_reg.o
 obj-$(CONFIG_MT9D112) += mt9d112.o mt9d112_reg.o
 obj-$(CONFIG_MT9P012) += mt9p012_fox.o mt9p012_reg.o
-- 
1.7.3

[PATCH v2 05/22] Staging: dream: qdsp5: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option
---
 drivers/staging/dream/qdsp5/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/dream/qdsp5/Makefile b/drivers/staging/dream/qdsp5/Makefile
index beedaaf..44ae6b4 100644
--- a/drivers/staging/dream/qdsp5/Makefile
+++ b/drivers/staging/dream/qdsp5/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS=-Idrivers/staging/dream/include
+ccflags-y:=-Idrivers/staging/dream/include
 obj-y += adsp.o
 ifeq ($(CONFIG_MSM_AMSS_VERSION_6350),y)
 obj-y += adsp_info.o
-- 
1.7.3

[PATCH v2 06/22] Staging: easycap: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/easycap/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile
index d93bd6b..d3133f8 100644
--- a/drivers/staging/easycap/Makefile
+++ b/drivers/staging/easycap/Makefile
@@ -5,9 +5,9 @@ easycap-objs	:= easycap_main.o easycap_low.o easycap_sound.o
 easycap-objs	+= easycap_ioctl.o easycap_settings.o
 easycap-objs	+= easycap_testcard.o
 
-EXTRA_CFLAGS += -Wall
+ccflags-y := -Wall
 # Impose all or none of the following:
-EXTRA_CFLAGS += -DEASYCAP_IS_VIDEODEV_CLIENT
-EXTRA_CFLAGS += -DEASYCAP_NEEDS_V4L2_DEVICE_H
-EXTRA_CFLAGS += -DEASYCAP_NEEDS_V4L2_FOPS
+ccflags-y := -DEASYCAP_IS_VIDEODEV_CLIENT
+ccflags-y := -DEASYCAP_NEEDS_V4L2_DEVICE_H
+ccflags-y := -DEASYCAP_NEEDS_V4L2_FOPS
 
-- 
1.7.3

[PATCH v2 07/22] Staging: go7007: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/go7007/Makefile |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/go7007/Makefile b/drivers/staging/go7007/Makefile
index d37b7ed..9da150d 100644
--- a/drivers/staging/go7007/Makefile
+++ b/drivers/staging/go7007/Makefile
@@ -22,13 +22,12 @@ s2250-objs += s2250-board.o
 # Uncomment when the saa7134 patches get into upstream
 #ifneq ($(CONFIG_VIDEO_SAA7134),)
 #obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
-#EXTRA_CFLAGS += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3
+#ccflags-y := -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3
 #endif
 
 # S2250 needs cypress ezusb loader from dvb-usb
-ifneq ($(CONFIG_VIDEO_GO7007_USB_S2250_BOARD),)
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb
-endif
+ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD) := -Idrivers/media/dvb/dvb-usb
 
-EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+
+ccflags-y := -Idrivers/media/dvb/frontends
+ccflags-y := -Idrivers/media/dvb/dvb-core
-- 
1.7.3

[PATCH v2 08/22] Staging: otus: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/otus/Makefile |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/otus/Makefile b/drivers/staging/otus/Makefile
index debcc5c..c4d979d 100644
--- a/drivers/staging/otus/Makefile
+++ b/drivers/staging/otus/Makefile
@@ -1,25 +1,25 @@
 obj-$(CONFIG_OTUS)	+= arusb_lnx.o
 
-EXTRA_CFLAGS += -DAMAC
-EXTRA_CFLAGS += -DGCCK
-EXTRA_CFLAGS += -DOFDM
-EXTRA_CFLAGS += -DTXQ_IN_ISR
-EXTRA_CFLAGS += -DWLAN_HOSTIF=0 #0:USB, 1:PCI
+ccflags-y := -DAMAC
+ccflags-y := -DGCCK
+ccflags-y := -DOFDM
+ccflags-y := -DTXQ_IN_ISR
+ccflags-y := -DWLAN_HOSTIF=0 #0:USB, 1:PCI
 
 #Test Mode
-EXTRA_CFLAGS += -DZM_USB_STREAM_MODE=1
-EXTRA_CFLAGS += -DZM_USB_TX_STREAM_MODE=0
-EXTRA_CFLAGS += -DZM_PCI_DMA_TEST=0
-EXTRA_CFLAGS += -DZM_LARGEPAYLOAD_TEST=0
-EXTRA_CFLAGS += -DZM_FW_LOOP_BACK=0
-EXTRA_CFLAGS += -DZM_LINUX_TPC=1
-#EXTRA_CFLAGS += -DZM_DONT_COPY_RX_BUFFER
+ccflags-y := -DZM_USB_STREAM_MODE=1
+ccflags-y := -DZM_USB_TX_STREAM_MODE=0
+ccflags-y := -DZM_PCI_DMA_TEST=0
+ccflags-y := -DZM_LARGEPAYLOAD_TEST=0
+ccflags-y := -DZM_FW_LOOP_BACK=0
+ccflags-y := -DZM_LINUX_TPC=1
+#ccflags-y := -DZM_DONT_COPY_RX_BUFFER
 
-EXTRA_CFLAGS += -DZM_HOSTAPD_SUPPORT
-#EXTRA_CFLAGS += -DfTX_GAIN_OFDM=0
-#EXTRA_CFLAGS += -DZM_CONFIG_BIG_ENDIAN -DBIG_ENDIAN
-EXTRA_CFLAGS += -DZM_HALPLUS_LOCK
-EXTRA_CFLAGS += -DZM_OTUS_LINUX_PHASE_2
+ccflags-y := -DZM_HOSTAPD_SUPPORT
+ccflags-y := -DfTX_GAIN_OFDM=0
+ccflags-y := -DZM_CONFIG_BIG_ENDIAN -DBIG_ENDIAN
+ccflags-y := -DZM_HALPLUS_LOCK
+ccflags-y := -DZM_OTUS_LINUX_PHASE_2
 
 arusb_lnx-objs := \
 	usbdrv.o \
-- 
1.7.3

[PATCH v2 09/22] Staging: rt2860: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rt2860/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rt2860/Makefile b/drivers/staging/rt2860/Makefile
index 23ae07f..c6ea9b8 100644
--- a/drivers/staging/rt2860/Makefile
+++ b/drivers/staging/rt2860/Makefile
@@ -1,10 +1,10 @@
 obj-$(CONFIG_RT2860)	+= rt2860sta.o
 
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
-EXTRA_CFLAGS += -DRTMP_MAC_PCI -DRTMP_PCI_SUPPORT -DRT2860
-EXTRA_CFLAGS += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3090
-EXTRA_CFLAGS += -DDBG
+ccflags-y := -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
+ccflags-y := -DRTMP_MAC_PCI -DRTMP_PCI_SUPPORT -DRT2860
+ccflags-y := -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3090
+ccflags-y := -DDBG
 
 rt2860sta-objs :=	\
 	common/crypt_md5.o	\
-- 
1.7.3

[PATCH v2 10/22] Staging: rt2870: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rt2870/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rt2870/Makefile b/drivers/staging/rt2870/Makefile
index 523e7e7..fed4466 100644
--- a/drivers/staging/rt2870/Makefile
+++ b/drivers/staging/rt2870/Makefile
@@ -2,10 +2,10 @@
 obj-$(CONFIG_RT2870)	+= rt2870sta.o
 
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
-EXTRA_CFLAGS += -DRTMP_MAC_USB -DRTMP_USB_SUPPORT -DRT2870 -DRTMP_TIMER_TASK_SUPPORT
-EXTRA_CFLAGS += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3070
-EXTRA_CFLAGS += -DDBG
+ccflags-y := -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
+ccflags-y := -DRTMP_MAC_USB -DRTMP_USB_SUPPORT -DRT2870 -DRTMP_TIMER_TASK_SUPPORT
+ccflags-y := -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3070
+ccflags-y := -DDBG
 
 rt2870sta-objs :=		\
 	common/crypt_md5.o	\
-- 
1.7.3

[PATCH v2 11/22] Staging: rtl8187se: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rtl8187se/Makefile |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile
index e6adf91..51fbd24 100644
--- a/drivers/staging/rtl8187se/Makefile
+++ b/drivers/staging/rtl8187se/Makefile
@@ -1,20 +1,20 @@
 
-#EXTRA_CFLAGS += -DCONFIG_IEEE80211_NOWEP=y
-#EXTRA_CFLAGS += -std=gnu89
-#EXTRA_CFLAGS += -O2
+#ccflags-y := -DCONFIG_IEEE80211_NOWEP=y
+#ccflags-y := -std=gnu89
+#ccflags-y := -O2
 #CC            = gcc
 
-EXTRA_CFLAGS += -DSW_ANTE
-EXTRA_CFLAGS += -DTX_TRACK
-EXTRA_CFLAGS += -DHIGH_POWER
-EXTRA_CFLAGS += -DSW_DIG
-EXTRA_CFLAGS += -DRATE_ADAPT
+ccflags-y := -DSW_ANTE
+ccflags-y := -DTX_TRACK
+ccflags-y := -DHIGH_POWER
+ccflags-y := -DSW_DIG
+ccflags-y := -DRATE_ADAPT
 
 #enable it for legacy power save, disable it for leisure  power save
-EXTRA_CFLAGS += -DENABLE_LPS
+ccflags-y := -DENABLE_LPS
 
 
-#EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
+#ccflags-y := -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
 
 r8187se-objs :=			\
 		r8180_core.o		\
-- 
1.7.3

Re: [PATCH v2 11/22] Staging: rtl8187se: Makefile: cleaned up makefile cflag lines

[walter harms]

Tracey Dent schrieb:
> Changed to use proper ccflags-y option
> 
> Signed-off-by: Tracey Dent <tdent48227@gmail.com>
> ---
>  drivers/staging/rtl8187se/Makefile |   20 ++++++++++----------
>  1 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile
> index e6adf91..51fbd24 100644
> --- a/drivers/staging/rtl8187se/Makefile
> +++ b/drivers/staging/rtl8187se/Makefile
> @@ -1,20 +1,20 @@
>  
> -#EXTRA_CFLAGS += -DCONFIG_IEEE80211_NOWEP=y
> -#EXTRA_CFLAGS += -std=gnu89
> -#EXTRA_CFLAGS += -O2
> +#ccflags-y := -DCONFIG_IEEE80211_NOWEP=y
> +#ccflags-y := -std=gnu89
> +#ccflags-y := -O2
>  #CC            = gcc
>  
> -EXTRA_CFLAGS += -DSW_ANTE
> -EXTRA_CFLAGS += -DTX_TRACK
> -EXTRA_CFLAGS += -DHIGH_POWER
> -EXTRA_CFLAGS += -DSW_DIG
> -EXTRA_CFLAGS += -DRATE_ADAPT
> +ccflags-y := -DSW_ANTE
> +ccflags-y := -DTX_TRACK
> +ccflags-y := -DHIGH_POWER
> +ccflags-y := -DSW_DIG
> +ccflags-y := -DRATE_ADAPT
>  
>  #enable it for legacy power save, disable it for leisure  power save
> -EXTRA_CFLAGS += -DENABLE_LPS
> +ccflags-y := -DENABLE_LPS
>  
>  
> -#EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
> +#ccflags-y := -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
>  

I do not understand this. If CONFIG_FORCE_HARD_FLOAT is required by the
driver so he should fail if CONFIG_FORCE_HARD_FLOAT=n
Or you need to protect the -mhard-float with an if().

re,
 wh

Re: [PATCH v2 11/22] Staging: rtl8187se: Makefile: cleaned up makefile cflag lines

[Greg KH]

On Sat, Sep 25, 2010 at 12:44:52PM +0200, walter harms wrote:
> 
> 
> Tracey Dent schrieb:
> > Changed to use proper ccflags-y option
> > 
> > Signed-off-by: Tracey Dent <tdent48227@gmail.com>
> > ---
> >  drivers/staging/rtl8187se/Makefile |   20 ++++++++++----------
> >  1 files changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile
> > index e6adf91..51fbd24 100644
> > --- a/drivers/staging/rtl8187se/Makefile
> > +++ b/drivers/staging/rtl8187se/Makefile
> > @@ -1,20 +1,20 @@
> >  
> > -#EXTRA_CFLAGS += -DCONFIG_IEEE80211_NOWEP=y
> > -#EXTRA_CFLAGS += -std=gnu89
> > -#EXTRA_CFLAGS += -O2
> > +#ccflags-y := -DCONFIG_IEEE80211_NOWEP=y
> > +#ccflags-y := -std=gnu89
> > +#ccflags-y := -O2
> >  #CC            = gcc
> >  
> > -EXTRA_CFLAGS += -DSW_ANTE
> > -EXTRA_CFLAGS += -DTX_TRACK
> > -EXTRA_CFLAGS += -DHIGH_POWER
> > -EXTRA_CFLAGS += -DSW_DIG
> > -EXTRA_CFLAGS += -DRATE_ADAPT
> > +ccflags-y := -DSW_ANTE
> > +ccflags-y := -DTX_TRACK
> > +ccflags-y := -DHIGH_POWER
> > +ccflags-y := -DSW_DIG
> > +ccflags-y := -DRATE_ADAPT
> >  
> >  #enable it for legacy power save, disable it for leisure  power save
> > -EXTRA_CFLAGS += -DENABLE_LPS
> > +ccflags-y := -DENABLE_LPS
> >  
> >  
> > -#EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
> > +#ccflags-y := -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
> >  
> 
> I do not understand this. If CONFIG_FORCE_HARD_FLOAT is required by the
> driver so he should fail if CONFIG_FORCE_HARD_FLOAT=n
> Or you need to protect the -mhard-float with an if().

That line is commented out, it doesn't do anything, so I wouldn't worry
about it :)

thanks,

greg k-h

[PATCH v2 12/22] Staging: rt8192e: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rtl8192e/Makefile |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile
index 41cb4d3..96e7abf 100644
--- a/drivers/staging/rtl8192e/Makefile
+++ b/drivers/staging/rtl8192e/Makefile
@@ -1,13 +1,13 @@
 NIC_SELECT = RTL8192E
 
-EXTRA_CFLAGS += -DRTL8192E
-EXTRA_CFLAGS += -std=gnu89
-EXTRA_CFLAGS += -O2
-EXTRA_CFLAGS += -DTHOMAS_TURBO
-EXTRA_CFLAGS += -DENABLE_DOT11D
+ccflags-y := -DRTL8192E
+ccflags-y := -std=gnu89
+ccflags-y := -O2
+ccflags-y := -DTHOMAS_TURBO
+ccflags-y := -DENABLE_DOT11D
 
-EXTRA_CFLAGS += -DENABLE_IPS
-EXTRA_CFLAGS += -DENABLE_LPS
+ccflags-y := -DENABLE_IPS
+ccflags-y := -DENABLE_LPS
 
 r8192e_pci-objs :=		\
 	r8192E_core.o		\
-- 
1.7.3

[PATCH v2 13/22] Staging: rtl8192su: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rtl8192su/Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile
index 7133894..88bcd97 100644
--- a/drivers/staging/rtl8192su/Makefile
+++ b/drivers/staging/rtl8192su/Makefile
@@ -1,12 +1,12 @@
 NIC_SELECT = RTL8192SU
 
-EXTRA_CFLAGS += -std=gnu89
-EXTRA_CFLAGS += -O2
+ccflags-y := -std=gnu89
+ccflags-y := -O2
 
-EXTRA_CFLAGS += -DJACKSON_NEW_RX
-EXTRA_CFLAGS += -DTHOMAS_BEACON
+ccflags-y := -DJACKSON_NEW_RX
+ccflags-y := -DTHOMAS_BEACON
 
-#EXTRA_CFLAGS += -DMUTIPLE_BULK_OUT
+#ccflags-y := -DMUTIPLE_BULK_OUT
 
 r8192s_usb-objs :=		\
 	r8192U_wx.o		\
-- 
1.7.3

[PATCH v2 14/22] Staging: rtl8192su: ieee80211: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Change to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rtl8192su/ieee80211/Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8192su/ieee80211/Makefile b/drivers/staging/rtl8192su/ieee80211/Makefile
index a500bfa..0df57eb 100644
--- a/drivers/staging/rtl8192su/ieee80211/Makefile
+++ b/drivers/staging/rtl8192su/ieee80211/Makefile
@@ -1,10 +1,10 @@
 NIC_SELECT = RTL8192SU
 
-EXTRA_CFLAGS += -O2
-EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0
-EXTRA_CFLAGS += -DRTL8192SU
-#EXTRA_CFLAGS += -DJOHN_NOCPY
-EXTRA_CFLAGS += -DTHOMAS_TURBO
+ccflags-y := -O2
+ccflags-y := -DRTL8192S_DISABLE_FW_DM=0
+ccflags-y := -DRTL8192SU
+#ccflags-y := -DJOHN_NOCPY
+ccflags-y := -DTHOMAS_TURBO
 
 ieee80211-rsl-objs := ieee80211_rx.o \
 		      ieee80211_softmac.o \
-- 
1.7.3

[PATCH v2 15/22] Staging: rtl8192u: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rtl8192u/Makefile |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile
index 738f4a8..1710921 100644
--- a/drivers/staging/rtl8192u/Makefile
+++ b/drivers/staging/rtl8192u/Makefile
@@ -1,16 +1,16 @@
 NIC_SELECT = RTL8192U
 
-EXTRA_CFLAGS += -std=gnu89
-EXTRA_CFLAGS += -O2
+ccflags-y := -std=gnu89
+ccflags-y := -O2
 
-EXTRA_CFLAGS += -DCONFIG_FORCE_HARD_FLOAT=y
-EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
-EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
-#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
-#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT
-EXTRA_CFLAGS += -DUSE_ONE_PIPE
-EXTRA_CFLAGS += -DENABLE_DOT11D
-EXTRA_CFLAGS += -Idrivers/staging/rtl8192u/ieee80211
+ccflags-y := -DCONFIG_FORCE_HARD_FLOAT=y
+ccflags-y := -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
+ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
+#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE
+#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT
+ccflags-y += -DUSE_ONE_PIPE
+ccflags-y += -DENABLE_DOT11D
+ccflags-y += -Idrivers/staging/rtl8192u/ieee80211
 
 r8192u_usb-objs := r8192U_core.o r8180_93cx6.o r8192U_wx.o		\
 		  r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o	\
-- 
1.7.3

Re: [PATCH v2 15/22] Staging: rtl8192u: Makefile: cleaned up makefile cflag lines

[walter harms]

Tracey Dent schrieb:
> Changed to use proper ccflags-y option
> 
> Signed-off-by: Tracey Dent <tdent48227@gmail.com>
> ---
>  drivers/staging/rtl8192u/Makefile |   20 ++++++++++----------
>  1 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile
> index 738f4a8..1710921 100644
> --- a/drivers/staging/rtl8192u/Makefile
> +++ b/drivers/staging/rtl8192u/Makefile
> @@ -1,16 +1,16 @@
>  NIC_SELECT = RTL8192U
>  
> -EXTRA_CFLAGS += -std=gnu89
> -EXTRA_CFLAGS += -O2
> +ccflags-y := -std=gnu89
> +ccflags-y := -O2
>  

Is this -O2 a requirement ? I did not look into other makefiles but i would expect
-O2 to be set in the main-makefile. (Imagine someone disables the optimsation only
to find a driver that does behave different).



> -EXTRA_CFLAGS += -DCONFIG_FORCE_HARD_FLOAT=y
> -EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
> -EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO

Is THOMAS_BEACON etc a defined algorithem or so ? If not a bit more desciptive name
would be nice

just my 2 cents,
 re
 wh

> -#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
> -#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT
> -EXTRA_CFLAGS += -DUSE_ONE_PIPE
> -EXTRA_CFLAGS += -DENABLE_DOT11D
> -EXTRA_CFLAGS += -Idrivers/staging/rtl8192u/ieee80211
> +ccflags-y := -DCONFIG_FORCE_HARD_FLOAT=y
> +ccflags-y := -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
> +ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
> +#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE
> +#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT
> +ccflags-y += -DUSE_ONE_PIPE
> +ccflags-y += -DENABLE_DOT11D
> +ccflags-y += -Idrivers/staging/rtl8192u/ieee80211
>  
>  r8192u_usb-objs := r8192U_core.o r8180_93cx6.o r8192U_wx.o		\
>  		  r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o	\

Re: [PATCH v2 15/22] Staging: rtl8192u: Makefile: cleaned up makefile cflag lines

[Greg KH]

On Sat, Sep 25, 2010 at 12:52:44PM +0200, walter harms wrote:
> 
> 
> Tracey Dent schrieb:
> > Changed to use proper ccflags-y option
> > 
> > Signed-off-by: Tracey Dent <tdent48227@gmail.com>
> > ---
> >  drivers/staging/rtl8192u/Makefile |   20 ++++++++++----------
> >  1 files changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile
> > index 738f4a8..1710921 100644
> > --- a/drivers/staging/rtl8192u/Makefile
> > +++ b/drivers/staging/rtl8192u/Makefile
> > @@ -1,16 +1,16 @@
> >  NIC_SELECT = RTL8192U
> >  
> > -EXTRA_CFLAGS += -std=gnu89
> > -EXTRA_CFLAGS += -O2
> > +ccflags-y := -std=gnu89
> > +ccflags-y := -O2
> >  
> 
> Is this -O2 a requirement ? I did not look into other makefiles but i would expect
> -O2 to be set in the main-makefile. (Imagine someone disables the optimsation only
> to find a driver that does behave different).

Yes, it should be removed, but that's not the goal of this patch.

> > -EXTRA_CFLAGS += -DCONFIG_FORCE_HARD_FLOAT=y
> > -EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
> > -EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
> 
> Is THOMAS_BEACON etc a defined algorithem or so ? If not a bit more desciptive name
> would be nice

Lots of things would be "nice" for this driver :)

thanks,

greg k-h

[PATCH v2 16/22] Staging: rtl8192u: ieee80211: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed yo use the proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48277@gmail.com>
---
 drivers/staging/rtl8192u/ieee80211/Makefile |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile
index 71ca5d9..c45ebf9 100644
--- a/drivers/staging/rtl8192u/ieee80211/Makefile
+++ b/drivers/staging/rtl8192u/ieee80211/Makefile
@@ -5,22 +5,22 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/$(NIC_SELECT)
 
 CC = gcc
 ifneq ($(shell uname -r|cut -d. -f1,2), 2.4)
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/wireless
-EXTRA_CFLAGS += -O2
-EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
+ccflags-y := -I$(TOPDIR)/drivers/net/wireless
+ccflags-y := -O2
+ccflags-y := -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
 
 #it will fail to compile in suse linux enterprise 10 sp2. This flag is to solve this problem.
 ifeq ($(shell uname -r | cut -d. -f1,2,3,4), 2.6.16.60-0)
-EXTRA_CFLAGS += -DOPENSUSE_SLED
+ccflags-y := -DOPENSUSE_SLED
 endif
 
 ifeq ($(NIC_SELECT),RTL8192U)
-#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
-#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT
+#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE
+#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT
 endif
-#EXTRA_CFLAGS += -DJOHN_NOCPY
+#ccflags-y := -DJOHN_NOCPY
 #flags to enable or disble 80211D feature
-EXTRA_CFLAGS += -DENABLE_DOT11D
+ccflags-y := -DENABLE_DOT11D
 ieee80211-rsl-objs := ieee80211_rx.o \
 		      ieee80211_softmac.o \
 		      ieee80211_tx.o \
-- 
1.7.3

[PATCH v2 17/22] Staging: tm6000: Makefile: changed up makefile cflag lines

[Tracey Dent]

Changed to use the proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/tm6000/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/tm6000/Makefile b/drivers/staging/tm6000/Makefile
index 77e06bf..80701c9 100644
--- a/drivers/staging/tm6000/Makefile
+++ b/drivers/staging/tm6000/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
 obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
 obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
 
-EXTRA_CFLAGS = -Idrivers/media/video
-EXTRA_CFLAGS += -Idrivers/media/common/tuners
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+ccflags-y := -Idrivers/media/video
+ccflags-y := -Idrivers/media/common/tuners
+ccflags-y := -Idrivers/media/dvb/dvb-core
+ccflags-y := -Idrivers/media/dvb/frontends
-- 
1.7.3

[PATCH v2 18/22] Staging: usbip: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/usbip/Makefile |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile
index 6f2916b..10307f8 100644
--- a/drivers/staging/usbip/Makefile
+++ b/drivers/staging/usbip/Makefile
@@ -7,6 +7,5 @@ vhci-hcd-objs := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o
 obj-$(CONFIG_USB_IP_HOST) += usbip.o
 usbip-objs := stub_dev.o stub_main.o stub_rx.o stub_tx.o
 
-ifeq ($(CONFIG_USB_IP_DEBUG_ENABLE),y)
-	EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG
+
-- 
1.7.3

[PATCH v2 19/22] Staging: vt6655: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/vt6655/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile
index 824c971..b7cb1d5 100644
--- a/drivers/staging/vt6655/Makefile
+++ b/drivers/staging/vt6655/Makefile
@@ -1,6 +1,6 @@
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -D__NO_VERSION__
-EXTRA_CFLAGS += -DHOSTAP
+ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__
+ccflags-y := -DHOSTAP
 
 vt6655_stage-y +=	device_main.o \
 	card.o \
-- 
1.7.3

[PATCH v2 20/22] Staging: vt6656: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/vt6656/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index 582a35197..6a85a0e 100644
--- a/drivers/staging/vt6656/Makefile
+++ b/drivers/staging/vt6656/Makefile
@@ -1,6 +1,6 @@
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
-EXTRA_CFLAGS += -DHOSTAP
+ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
+ccflags-y := -DHOSTAP
 
 vt6656_stage-y +=	main_usb.o \
 			card.o  \
-- 
1.7.3

[PATCH v2 21/22] Staging: wlags49_h2: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/wlags49_h2/Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wlags49_h2/Makefile b/drivers/staging/wlags49_h2/Makefile
index 25d0a8a..198b823 100644
--- a/drivers/staging/wlags49_h2/Makefile
+++ b/drivers/staging/wlags49_h2/Makefile
@@ -12,8 +12,8 @@
 #  If you want to build AP support (untested), comment out -DSTA_ONLY
 
 INSTALLDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless
-EXTRA_CFLAGS += -I$(KERNELDIR)/include
-EXTRA_CFLAGS += -I$(src) \
+ccflags-y := -I$(KERNELDIR)/include
+ccflags-y := -I$(src) \
 		-DBUS_PCMCIA \
 		-DUSE_WPA \
 		-DUSE_WEXT \
@@ -25,16 +25,16 @@ EXTRA_CFLAGS += -I$(src) \
 #		-DUSE_UIL \
 #		-DUSE_PROFILE \
 
-ifeq ($(findstring HERMES25,$(EXTRA_CFLAGS)),)
+ifeq ($(findstring HERMES25,$(ccflags-y)),)
 WLNAME := wlags49_h2_cs
 $(WLNAME)-y := sta_h2.o
-ifeq ($(findstring STA_ONLY,$(EXTRA_CFLAGS)),)
+ifeq ($(findstring STA_ONLY,$(ccflags-y)),)
 $(WLNAME)-y += ap_h2.o
 endif
 else
 WLNAME=wlags49_h25_cs
 $(WLNAME)-y := sta_h25.o
-ifeq ($(findstring STA_ONLY,$(EXTRA_CFLAGS)),)
+ifeq ($(findstring STA_ONLY,$(ccflags-y)),)
 $(WLNAME)-y += ap_h25.o
 endif
 endif
-- 
1.7.3

[PATCH v2 22/22] Staging: wlags49_h25: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed to use proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/wlags49_h25/Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wlags49_h25/Makefile b/drivers/staging/wlags49_h25/Makefile
index d0b23d4..f04976f 100644
--- a/drivers/staging/wlags49_h25/Makefile
+++ b/drivers/staging/wlags49_h25/Makefile
@@ -12,8 +12,8 @@
 #  If you want to build AP support (untested), comment out -DSTA_ONLY
 
 INSTALLDIR := /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless
-EXTRA_CFLAGS += -I$(KERNELDIR)/include
-EXTRA_CFLAGS += -I$(src) \
+ccflags-y := -I$(KERNELDIR)/include
+ccflags-y := -I$(src) \
 		-DBUS_PCMCIA \
 		-DUSE_WPA \
 		-DUSE_WEXT \
@@ -25,16 +25,16 @@ EXTRA_CFLAGS += -I$(src) \
 #		-DUSE_UIL \
 #		-DUSE_PROFILE \
 
-ifeq ($(findstring HERMES25,$(EXTRA_CFLAGS)),)
+ifeq ($(findstring HERMES25,$(ccflags-y)),)
 WLNAME := wlags49_h2_cs
 $(WLNAME)-y := sta_h2.o
-ifeq ($(findstring STA_ONLY,$(EXTRA_CFLAGS)),)
+ifeq ($(findstring STA_ONLY,$(ccflags-y)),)
 $(WLNAME)-y += ap_h2.o
 endif
 else
 WLNAME=wlags49_h25_cs
 $(WLNAME)-y := sta_h25.o
-ifeq ($(findstring STA_ONLY,$(EXTRA_CFLAGS)),)
+ifeq ($(findstring STA_ONLY,$(ccflags-y)),)
 $(WLNAME)-y += ap_h25.o
 endif
 endif
-- 
1.7.3

Re: [PATCH v2 01/22] Staging: cx25821: Makefile:cleaned up makefile cflag lines

[Sam Ravnborg]

On Fri, Sep 24, 2010 at 07:27:49PM -0400, Tracey Dent wrote:
> changed to use proper ccflags-y option
> 
> Signed-off-by: Tracey Dent <tdent48227@gmail.com>
> ---
>  drivers/staging/cx25821/Makefile |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/cx25821/Makefile b/drivers/staging/cx25821/Makefile
> index d0eb16e..2f1c73e 100644
> --- a/drivers/staging/cx25821/Makefile
> +++ b/drivers/staging/cx25821/Makefile
> @@ -7,7 +7,7 @@ cx25821-objs   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
>  obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
>  obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
>  
> -EXTRA_CFLAGS += -Idrivers/media/video
> -EXTRA_CFLAGS += -Idrivers/media/common/tuners
> -EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
> -EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
> +ccflags-y := -Idrivers/media/video
> +ccflags-y := -Idrivers/media/common/tuners
> +ccflags-y := -Idrivers/media/dvb/dvb-core
> +ccflags-y := -Idrivers/media/dvb/frontends

This is wrong.

First you assign "ccflags-y" the value -Idrivers/media/video
And in next line you assign it a new value - loosing the old value.

It should lok like this:
> +ccflags-y := -Idrivers/media/video
> +ccflags-y += -Idrivers/media/common/tuners
> +ccflags-y += -Idrivers/media/dvb/dvb-core
> +ccflags-y += -Idrivers/media/dvb/frontends

In this way you append to the variable.

You said in another mil that it builds.
This tells me that either some of the assignments are not needes - or you just loose
something that you are not aware of.

Please go through all your patches and fix it up - I saw the above
bug in the two patches I looked at.

	Sam

Re: [PATCH v2 01/22] Staging: cx25821: Makefile:cleaned up makefile cflag lines

[Greg KH]

On Sat, Sep 25, 2010 at 12:28:01PM +0200, Sam Ravnborg wrote:
> On Fri, Sep 24, 2010 at 07:27:49PM -0400, Tracey Dent wrote:
> > changed to use proper ccflags-y option
> > 
> > Signed-off-by: Tracey Dent <tdent48227@gmail.com>
> > ---
> >  drivers/staging/cx25821/Makefile |    8 ++++----
> >  1 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/staging/cx25821/Makefile b/drivers/staging/cx25821/Makefile
> > index d0eb16e..2f1c73e 100644
> > --- a/drivers/staging/cx25821/Makefile
> > +++ b/drivers/staging/cx25821/Makefile
> > @@ -7,7 +7,7 @@ cx25821-objs   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
> >  obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
> >  obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
> >  
> > -EXTRA_CFLAGS += -Idrivers/media/video
> > -EXTRA_CFLAGS += -Idrivers/media/common/tuners
> > -EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
> > -EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
> > +ccflags-y := -Idrivers/media/video
> > +ccflags-y := -Idrivers/media/common/tuners
> > +ccflags-y := -Idrivers/media/dvb/dvb-core
> > +ccflags-y := -Idrivers/media/dvb/frontends
> 
> This is wrong.
> 
> First you assign "ccflags-y" the value -Idrivers/media/video
> And in next line you assign it a new value - loosing the old value.
> 
> It should lok like this:
> > +ccflags-y := -Idrivers/media/video
> > +ccflags-y += -Idrivers/media/common/tuners
> > +ccflags-y += -Idrivers/media/dvb/dvb-core
> > +ccflags-y += -Idrivers/media/dvb/frontends
> 
> In this way you append to the variable.
> 
> You said in another mil that it builds.
> This tells me that either some of the assignments are not needes - or you just loose
> something that you are not aware of.
> 
> Please go through all your patches and fix it up - I saw the above
> bug in the two patches I looked at.

I agree, these need to be fixed up, care to redo the series and send
them again?

thanks,

greg k-h

[PATCH v2 16/22] Staging: rtl8192u: ieee80211: Makefile: cleaned up makefile cflag lines

[Tracey Dent]

Changed yo use the proper ccflags-y option

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 drivers/staging/rtl8192u/ieee80211/Makefile |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/Makefile b/drivers/staging/rtl8192u/ieee80211/Makefile
index 71ca5d9..c45ebf9 100644
--- a/drivers/staging/rtl8192u/ieee80211/Makefile
+++ b/drivers/staging/rtl8192u/ieee80211/Makefile
@@ -5,22 +5,22 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/$(NIC_SELECT)
 
 CC = gcc
 ifneq ($(shell uname -r|cut -d. -f1,2), 2.4)
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/wireless
-EXTRA_CFLAGS += -O2
-EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
+ccflags-y := -I$(TOPDIR)/drivers/net/wireless
+ccflags-y := -O2
+ccflags-y := -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
 
 #it will fail to compile in suse linux enterprise 10 sp2. This flag is to solve this problem.
 ifeq ($(shell uname -r | cut -d. -f1,2,3,4), 2.6.16.60-0)
-EXTRA_CFLAGS += -DOPENSUSE_SLED
+ccflags-y := -DOPENSUSE_SLED
 endif
 
 ifeq ($(NIC_SELECT),RTL8192U)
-#EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
-#EXTRA_CFLAGS += -DUSB_RX_AGGREGATION_SUPPORT
+#ccflags-y := -DUSB_TX_DRIVER_AGGREGATION_ENABLE
+#ccflags-y := -DUSB_RX_AGGREGATION_SUPPORT
 endif
-#EXTRA_CFLAGS += -DJOHN_NOCPY
+#ccflags-y := -DJOHN_NOCPY
 #flags to enable or disble 80211D feature
-EXTRA_CFLAGS += -DENABLE_DOT11D
+ccflags-y := -DENABLE_DOT11D
 ieee80211-rsl-objs := ieee80211_rx.o \
 		      ieee80211_softmac.o \
 		      ieee80211_tx.o \
-- 
1.7.3