[yocto] [PATCH 13/22] meta: factor out SCSI options from the usb-mass-storage feature

[tom.zanussi at intel.com]

From: Tom Zanussi <tom.zanussi at intel.com>

Remove the SCSI and BLK_DEV_SD options from usb-mass-storage.cfg and
replace them with the corresponding scsi/ features.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg |    2 --
 meta/cfg/kernel-cache/cfg/usb-mass-storage.scc |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg b/meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg
index f3282e1..abd9712 100644
--- a/meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg
+++ b/meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg
@@ -2,8 +2,6 @@
 # USB is not explicitly enabled here, since that should be a 
 # per-BSP enablement.
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_USB_STORAGE=y
 CONFIG_VFAT_FS=y
 CONFIG_FAT_FS=y
diff --git a/meta/cfg/kernel-cache/cfg/usb-mass-storage.scc b/meta/cfg/kernel-cache/cfg/usb-mass-storage.scc
index 882e393..aed330c 100644
--- a/meta/cfg/kernel-cache/cfg/usb-mass-storage.scc
+++ b/meta/cfg/kernel-cache/cfg/usb-mass-storage.scc
@@ -1,4 +1,6 @@
 define KFEATURE_DESCRIPTION "Enable options required for USB mass storage devices"
 define KFEATURE_COMPATIBILITY all
 
+include features/scsi/disk.scc
+
 kconf non-hardware usb-mass-storage.cfg
-- 
1.7.0.4