--- a/HAL/rtl8192/Makefile	2010-04-01 11:03:46.000000000 +0200
+++ b/HAL/rtl8192/Makefile	2011-08-15 11:45:40.431573415 +0200
@@ -4,7 +4,8 @@
 KVER  := $(shell uname -r)
 MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
 
-ifeq ($(shell uname -r|cut -d. -f1,2), 2.6)
+ifeq ($(shell uname -r|cut -d. -f1,2), 3.0)
+#ifeq ($(shell uname -r|cut -d. -f1,2), 2.6)
 ###################### KERNEL 2.6 ################################
 ifeq ($(NIC_SELECT),RTL8192CE)
 sub_folder = rtl8192c
@@ -460,77 +461,77 @@
 ###################### KERNEL 2.4 ################################
 LD := ld
 KSRC := /lib/modules/$(KVER)/build
-CONFIG_FILE := $(KSRC)/include/linux/autoconf.h
-CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -O2 -pipe -Wall
-CFLAGS += -I$(KSRC)/include -I.
-CFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h
-#CFLAGS += -D__NO_VERSION__ -DEXPORT_SYMTAB  
+CONFIG_FILE := $(KSRC)/include/generated/autoconf.h
+EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -O2 -pipe -Wall
+EXTRA_CFLAGS += -I$(KSRC)/include -I.
+EXTRA_CFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/config/modversions.h
+#EXTRA_CFLAGS += -D__NO_VERSION__ -DEXPORT_SYMTAB  
 
 ifeq ($(NIC_SELECT),RTL8190P)
 sub_folder = rtl8192e
-CFLAGS += -DRTL8190P
-CFLAGS+=-DEEPROM_OLD_FORMAT_SUPPORT=1
-#CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
+EXTRA_CFLAGS += -DRTL8190P
+EXTRA_CFLAGS+=-DEEPROM_OLD_FORMAT_SUPPORT=1
+#EXTRA_CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
 endif
 
 ifeq ($(NIC_SELECT),RTL8192E)
 sub_folder = rtl8192e
-CFLAGS += -DRTL8192E
-CFLAGS+=-DEEPROM_OLD_FORMAT_SUPPORT=1
-CFLAGS+=-DENABLE_GPIO_RADIO_CTL
-#CFLAGS += -DENABLE_IPS
-#CFLAGS += -DENABLE_IPS
-#CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
+EXTRA_CFLAGS += -DRTL8192E
+EXTRA_CFLAGS+=-DEEPROM_OLD_FORMAT_SUPPORT=1
+EXTRA_CFLAGS+=-DENABLE_GPIO_RADIO_CTL
+#EXTRA_CFLAGS += -DENABLE_IPS
+#EXTRA_CFLAGS += -DENABLE_IPS
+#EXTRA_CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
 endif
 
 ifeq ($(NIC_SELECT),RTL8192SE)
 sub_folder = rtl8192s
-CFLAGS += -DRTL8192SE
-CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT=0 
-CFLAGS += -DRTL92SE_FPGA_VERIFY=0 
-CFLAGS += -DDEMO_BOARD_SUPPORT=1 
-CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 
-CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 
-CFLAGS += -DHAL_MAC_ENABLE=1 
-CFLAGS += -DHAL_BB_ENABLE=1 
-CFLAGS += -DHAL_RF_ENABLE=1 
-CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE=1 
-CFLAGS += -DDISABLE_BB_RF=0 
-CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
-#CFLAGS += -DRTL8192S_WAPI_SUPPORT=1 
-#CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
-#CFLAGS += -DCONFIG_PM_RTL 
-#CFLAGS += -DENABLE_GPIO_RADIO_CTL  
+EXTRA_CFLAGS += -DRTL8192SE
+EXTRA_CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT=0 
+EXTRA_CFLAGS += -DRTL92SE_FPGA_VERIFY=0 
+EXTRA_CFLAGS += -DDEMO_BOARD_SUPPORT=1 
+EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 
+EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 
+EXTRA_CFLAGS += -DHAL_MAC_ENABLE=1 
+EXTRA_CFLAGS += -DHAL_BB_ENABLE=1 
+EXTRA_CFLAGS += -DHAL_RF_ENABLE=1 
+EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE=1 
+EXTRA_CFLAGS += -DDISABLE_BB_RF=0 
+EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
+#EXTRA_CFLAGS += -DRTL8192S_WAPI_SUPPORT=1 
+#EXTRA_CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
+#EXTRA_CFLAGS += -DCONFIG_PM_RTL 
+#EXTRA_CFLAGS += -DENABLE_GPIO_RADIO_CTL  
 #EXTRA_CFLAGS += -DCONFIG_PM
 #EXTRA_CFLAGS += -DENABLE_IPS
 #EXTRA_CFLAGS += -DENABLE_LPS
 #EXTRA_CFLAGS += -DCONFIG_ASPM_OR_D3
-#CFLAGS += -DENABLE_AMSDU
-#CFLAGS += -DADHOC_11N
+#EXTRA_CFLAGS += -DENABLE_AMSDU
+#EXTRA_CFLAGS += -DADHOC_11N
 endif
 
 ifeq ($(NIC_SELECT),RTL8191SE_MESH)
 sub_folder = rtl8192s
-CFLAGS += -DRTL8192SE
-CFLAGS +=-DEEPROM_OLD_FORMAT_SUPPORT=1
-#CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
-CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT=0 
-CFLAGS += -DRTL92SE_FPGA_VERIFY=0 
-CFLAGS += -DDEMO_BOARD_SUPPORT=1 
-CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 
-CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 
-CFLAGS += -DHAL_MAC_ENABLE=1 
-CFLAGS += -DHAL_BB_ENABLE=1 
-CFLAGS += -DHAL_RF_ENABLE=1 
-CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE=1 
-CFLAGS += -DDISABLE_BB_RF=0 
-CFLAGS += -DCONFIG_PM_RTL 
-CFLAGS += -DENABLE_GPIO_RADIO_CTL  
-CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
-CFLAGS += -DENABLE_IPS
-CFLAGS += -DENABLE_LPS
-CFLAGS += -DCONFIG_ASPM_OR_D3
-CFLAGS += -D_RTL8192_EXT_PATCH_ \
+EXTRA_CFLAGS += -DRTL8192SE
+EXTRA_CFLAGS +=-DEEPROM_OLD_FORMAT_SUPPORT=1
+#EXTRA_CFLAGS +=-DCONFIG_RTLWIFI_DEBUGFS
+EXTRA_CFLAGS += -DEEPROM_OLD_FORMAT_SUPPORT=0 
+EXTRA_CFLAGS += -DRTL92SE_FPGA_VERIFY=0 
+EXTRA_CFLAGS += -DDEMO_BOARD_SUPPORT=1 
+EXTRA_CFLAGS += -DRTL8192SU_DISABLE_CCK_RATE=0 
+EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0 
+EXTRA_CFLAGS += -DHAL_MAC_ENABLE=1 
+EXTRA_CFLAGS += -DHAL_BB_ENABLE=1 
+EXTRA_CFLAGS += -DHAL_RF_ENABLE=1 
+EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE=1 
+EXTRA_CFLAGS += -DDISABLE_BB_RF=0 
+EXTRA_CFLAGS += -DCONFIG_PM_RTL 
+EXTRA_CFLAGS += -DENABLE_GPIO_RADIO_CTL  
+EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
+EXTRA_CFLAGS += -DENABLE_IPS
+EXTRA_CFLAGS += -DENABLE_LPS
+EXTRA_CFLAGS += -DCONFIG_ASPM_OR_D3
+EXTRA_CFLAGS += -D_RTL8192_EXT_PATCH_ \
 	  -DMESH_8192_SPECIFIED \
 	  -D_MESH_DEBUG_ \
 	  -DTREE_BASED_ROUTING_ENABLE \
@@ -541,21 +542,21 @@
 	  -DCUSTOMER_ID_INTEL_CMPC \
 	  -DENABLE_AMSDU
 endif
-CFLAGS += -DTHOMAS_TURBO
-CFLAGS += -DENABLE_DOT11D
+EXTRA_CFLAGS += -DTHOMAS_TURBO
+EXTRA_CFLAGS += -DENABLE_DOT11D
 
 #flag for single module compile
-CFLAGS += -DBUILT_IN_RTLLIB
-CFLAGS += -DBUILT_IN_CRYPTO
-#CFLAGS += -DENABLE_TKIP11N
+EXTRA_CFLAGS += -DBUILT_IN_RTLLIB
+EXTRA_CFLAGS += -DBUILT_IN_CRYPTO
+#EXTRA_CFLAGS += -DENABLE_TKIP11N
 
-SMP := $(shell $(CC) $(CFLAGS) -E -dM $(CONFIG_FILE) | \
+SMP := $(shell $(CC) $(EXTRA_CFLAGS) -E -dM $(CONFIG_FILE) | \
    grep CONFIG_SMP | awk '{print $$3}')
 ifneq ($(SMP),1)
    SMP := 0
 endif
 ifeq ($(SMP),1)
-   CFLAGS    += -D__SMP__
+   EXTRA_CFLAGS    += -D__SMP__
 endif
 OBJS := ${patsubst %.c, %.o, ${wildcard *.c}}