diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta
index 1cbdafa919..013319b978 100644
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="285.03"
+PKG_VERSION="285.05.09"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index 1593392dd3..57c38aa4c9 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc8 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -685,9 +685,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1410,11 +1408,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1441,29 +1439,29 @@ CONFIG_IR_MCEUSB=m
 # CONFIG_IR_WINBOND_CIR is not set
 # CONFIG_RC_LOOPBACK is not set
 # CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1474,7 +1472,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1559,7 +1557,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1857,10 +1855,10 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
@@ -1922,7 +1920,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index 2d09c09b79..cd85960931 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc8 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -693,9 +693,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1629,11 +1627,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1662,29 +1660,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1695,7 +1693,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1788,7 +1786,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1860,8 +1858,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1882,8 +1880,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -1903,7 +1901,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -1915,7 +1913,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1926,7 +1924,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1939,8 +1937,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -1962,17 +1960,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2083,7 +2081,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
index c5e88353b4..2aaa6dd471 100644
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc8 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -658,9 +658,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1587,11 +1585,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1620,29 +1618,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1653,7 +1651,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1746,7 +1744,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1818,8 +1816,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1840,8 +1838,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -1861,7 +1859,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -1873,7 +1871,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1884,7 +1882,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1897,8 +1895,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -1920,17 +1918,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2035,7 +2033,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 2b2b044cd5..5059ec7503 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc8 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -700,9 +700,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1775,11 +1773,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1808,29 +1806,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1841,7 +1839,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1934,7 +1932,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -2012,8 +2010,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -2034,8 +2032,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -2055,7 +2053,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -2067,7 +2065,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -2078,7 +2076,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -2091,8 +2089,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -2114,17 +2112,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2258,7 +2256,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
@@ -2281,6 +2279,7 @@ CONFIG_SND_DMA_SGBUF=y
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
 CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DRIVERS is not set
 CONFIG_SND_PCI=y
@@ -2298,7 +2297,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_AZT3328 is not set
 # CONFIG_SND_BT87X is not set
 # CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_CMIPCI=m
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_OXYGEN=m
 # CONFIG_SND_CS4281 is not set
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index e9c2a476a4..b5e4d0922f 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc8 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -696,9 +696,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1772,11 +1770,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1805,29 +1803,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1838,7 +1836,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1931,7 +1929,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -2009,8 +2007,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -2031,8 +2029,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -2052,7 +2050,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -2064,7 +2062,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -2075,7 +2073,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -2088,8 +2086,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -2111,17 +2109,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2256,7 +2254,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
@@ -2279,6 +2277,7 @@ CONFIG_SND_DMA_SGBUF=y
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
 CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DRIVERS is not set
 CONFIG_SND_PCI=y
@@ -2296,7 +2295,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_AZT3328 is not set
 # CONFIG_SND_BT87X is not set
 # CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_CMIPCI=m
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_OXYGEN=m
 # CONFIG_SND_CS4281 is not set
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 021e4c209b..3c163a9708 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc8 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -687,9 +687,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1636,11 +1634,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1669,29 +1667,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1702,7 +1700,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1810,7 +1808,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1888,8 +1886,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1910,8 +1908,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -1931,7 +1929,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -1943,7 +1941,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1954,7 +1952,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1967,8 +1965,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -1990,17 +1988,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2113,7 +2111,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index c705fdebbb..f50501afd7 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc8 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -644,9 +644,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1586,11 +1584,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1619,29 +1617,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1652,7 +1650,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1760,7 +1758,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1838,8 +1836,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1860,8 +1858,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -1881,7 +1879,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -1893,7 +1891,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1904,7 +1902,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1917,8 +1915,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -1940,17 +1938,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2056,7 +2054,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index aa34b7b75c..85f4d7619f 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0-rc8 Kernel Configuration
+# Linux/i386 3.1.0-rc9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -689,9 +689,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1679,11 +1677,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1712,27 +1710,27 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1743,7 +1741,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1851,7 +1849,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1929,9 +1927,9 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
-CONFIG_DVB_HOPPER=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
 
 #
 # Supported nGene Adapters
@@ -1951,8 +1949,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -1972,7 +1970,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -1984,7 +1982,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1995,7 +1993,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -2007,8 +2005,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -2030,17 +2028,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2172,7 +2170,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 7f6300282a..1454cea188 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc8 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -647,9 +647,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1631,11 +1629,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1664,29 +1662,29 @@ CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_DVB=m
@@ -1697,7 +1695,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1805,7 +1803,7 @@ CONFIG_DVB_BUDGET_AV=m
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1883,8 +1881,8 @@ CONFIG_DVB_BT8XX=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=y
-CONFIG_DVB_MANTIS=y
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1905,8 +1903,8 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=y
-CONFIG_DVB_STB6100=y
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
@@ -1926,7 +1924,7 @@ CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=y
+CONFIG_DVB_STV0299=m
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
 CONFIG_DVB_TDA8083=m
@@ -1938,7 +1936,7 @@ CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=y
+CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1949,7 +1947,7 @@ CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=y
+CONFIG_DVB_ZL10353=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1962,8 +1960,8 @@ CONFIG_DVB_STV0367=m
 # DVB-C (cable) frontends
 #
 CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=y
-CONFIG_DVB_TDA10023=y
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
 CONFIG_DVB_STV0297=m
 
 #
@@ -1985,17 +1983,17 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=y
+CONFIG_DVB_PLL=m
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=y
+CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_TDA665x=y
+CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
@@ -2120,7 +2118,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index 1e37a23e7c..b856f035b1 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0-rc8 Kernel Configuration
+# Linux/x86_64 3.1.0-rc9 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -640,9 +640,7 @@ CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -1497,11 +1495,11 @@ CONFIG_MEDIA_SUPPORT=y
 # Multimedia core support
 #
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
+CONFIG_VIDEO_MEDIA=m
 
 #
 # Multimedia drivers
@@ -1528,33 +1526,33 @@ CONFIG_IR_NUVOTON=y
 # CONFIG_IR_WINBOND_CIR is not set
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -1644,7 +1642,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported USB Adapters
 #
-CONFIG_DVB_USB=y
+CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 # CONFIG_DVB_USB_A800 is not set
 CONFIG_DVB_USB_DIBUSB_MB=m
@@ -1908,16 +1906,16 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=y
+CONFIG_SND_HRTIMER=m
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
@@ -1974,7 +1972,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y