drivers/wireless: clean up Kconfig hierarchy

Kconfig entries for SCSC should be under drivers/wireless/scsc/Kconfig
as it is SCSC-specific.

Change-Id: I9bd0635080bec284e09eac8ecf97a18e8fc9a96e
Signed-off-by: Heesub Shin <heesub.shin@samsung.com>

diff --git a/os/drivers/wireless/Kconfig b/os/drivers/wireless/Kconfig
index 53756d6..e212984 100644 (file)
--- a/os/drivers/wireless/Kconfig
+++ b/os/drivers/wireless/Kconfig
@@ -5,18 +5,6 @@
 
 if DRIVERS_WIRELESS
 
-menuconfig SCSC_WLAN
-       bool "SCSC Wireless Module support"
-       default n
-       select SPI
-
 source drivers/wireless/scsc/Kconfig
 
-menuconfig SCSC_CORE
-       bool "SCSC Core driver Module support"
-       default n
-       select SPI
-
-source drivers/wireless/scsc/misc/Kconfig
-
 endif # DRIVERS_WIRELESS

diff --git a/os/drivers/wireless/scsc/Kconfig b/os/drivers/wireless/scsc/Kconfig
index db88bd9..05f2be6 100644 (file)
--- a/os/drivers/wireless/scsc/Kconfig
+++ b/os/drivers/wireless/scsc/Kconfig
@@ -1,3 +1,8 @@
+menuconfig SCSC_WLAN
+       bool "SCSC Wireless Module support"
+       default n
+       select SPI
+
 if SCSC_WLAN
 
 config SLSI_RX_PERFORMANCE_TEST
@@ -60,3 +65,24 @@ config SCSC_WLAN_MAX_INTERFACES
          number of interfaces.
 
 endif
+
+menuconfig SCSC_CORE
+       bool "SCSC Core driver Module support"
+       default n
+       select SPI
+
+if SCSC_CORE
+
+config SCSC_PLATFORM
+       bool "Samsung SCSC MIF Platform driver implementation"
+       default n
+
+config SCSC_WLANLITE
+       bool "Samsung SCSC WLANLITE driver mode"
+       default n
+
+config SCSC_DISABLE_WLAN_RESET
+       bool "Never power down the Samsung SCSC WLAN CPU"
+       default n
+
+endif

diff --git a/os/drivers/wireless/scsc/misc/Kconfig b/os/drivers/wireless/scsc/misc/Kconfig
deleted file mode 100644 (file)
index 94f2510..0000000
--- a/os/drivers/wireless/scsc/misc/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if SCSC_CORE
-
-config SCSC_PLATFORM
-       bool "Samsung SCSC MIF Platform driver implementation"
-       default n
-
-config SCSC_WLANLITE
-       bool "Samsung SCSC WLANLITE driver mode"
-       default n
-
-config SCSC_DISABLE_WLAN_RESET
-       bool "Never power down the Samsung SCSC WLAN CPU"
-       default n
-
-endif