diff --git a/debian/changelog b/debian/changelog
index 36d1fff8a..adec58acc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,10 @@ linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low
     KS959_DONGLE, NET_9P_FD, IP1000, VETH, IXGBE, NIU, TEHUTI, LIBERTAS_CS,
     LIBERTAS_SDIO, RT2X00, SENSORS_ADT7470, SENSORS_I5K_AMB, SENSORS_F71882FG,
     SENSORS_FSCHMD, SENSORS_IBMPEX, CRYPTO_XTS, CRYPTO_SEED, CRYPTO_AUTHENC,
-    DVB_S5H1409, DVB_TUNER_MT2131, INET_LRO.
+    DVB_S5H1409, DVB_TUNER_MT2131, INET_LRO, MMC_RICOH_MMC, MMC_SPI.
   * Disable smbfs in topconfig, not supported upstream, use cifs.
 
- -- maximilian attems <maks@debian.org>  Wed, 28 Nov 2007 14:23:22 +0100
+ -- maximilian attems <maks@debian.org>  Wed, 28 Nov 2007 14:35:55 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 
diff --git a/debian/config/config b/debian/config/config
index 447440129..5eb28253f 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1324,8 +1324,26 @@ CONFIG_FB_PM3=m
 CONFIG_FB_SM501=m
 
 #
-# InfiniBand support
+# MMC/SD Host Controller Drivers
 #
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_RICOH_MMC=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_RICOH_MMC=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -1493,19 +1511,14 @@ CONFIG_AMD8111E_NAPI=y
 CONFIG_R8169_NAPI=y
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
 # CONFIG_GIGASET_UNDOCREQ is not set
-CONFIG_MMC_SDHCI=m
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_RTC_LIB=m
 CONFIG_GIGASET_BASE=m
-CONFIG_NEW_LEDS=y
 CONFIG_SND_RIPTIDE=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_USB_ZC0301=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_LEDS_CLASS=m
 # CONFIG_USB_GADGET_AT91 is not set
 CONFIG_GIGASET_M105=m
 CONFIG_GIGASET_M101=m
@@ -1513,7 +1526,6 @@ CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_GIGASET_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
-CONFIG_LEDS_TRIGGERS=y
 CONFIG_SND_ALS300=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_SND_PDAUDIOCF=m
@@ -1542,7 +1554,6 @@ CONFIG_ACPI_DOCK=m
 CONFIG_SMSC_PHY=m
 CONFIG_USB_QUICKCAM_MESSENGER=m
 CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_SND_GINA20=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SND_GINA24=m
@@ -1897,7 +1908,6 @@ CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_USB_U132_HCD=m
 CONFIG_SND_MTS64=m
 CONFIG_SMSC37B787_WDT=m
-CONFIG_MMC_TIFM_SD=m
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_BLK_DEV_JMICRON=m
 CONFIG_SND_AC97_POWER_SAVE=y