diff --git a/recipes-bsp/linux/files/sysmocom-odu/defconfig b/recipes-bsp/linux/files/sysmocom-odu/defconfig
index 0382da6..f06028a 100644
--- a/recipes-bsp/linux/files/sysmocom-odu/defconfig
+++ b/recipes-bsp/linux/files/sysmocom-odu/defconfig
@@ -3,11 +3,12 @@ CONFIG_LOCALVERSION="-PD13.1.2"
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_FHANDLE=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
 CONFIG_CGROUPS=y
+CONFIG_BLK_DEV_INITRD=y
 # CONFIG_PERF_EVENTS is not set
 CONFIG_SLAB=y
 CONFIG_PROFILING=y
@@ -162,8 +163,8 @@ CONFIG_CAN_RAW=y
 CONFIG_CAN_BCM=y
 CONFIG_CAN_D_CAN=y
 CONFIG_CAN_D_CAN_PLATFORM=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
 CONFIG_RFKILL=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
@@ -217,17 +218,9 @@ CONFIG_USB_USBNET=y
 # CONFIG_USB_BELKIN is not set
 # CONFIG_USB_ARMLINUX is not set
 # CONFIG_USB_NET_ZAURUS is not set
-CONFIG_WLAN=y
 CONFIG_RT2X00=m
 CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_WL12XX_MENU=y
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 CONFIG_WL12XX_SDIO=m
 CONFIG_INPUT_EVDEV=y
@@ -327,12 +320,13 @@ CONFIG_USB_OTG=y
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MUSB_TI81XX_GLUE=y
 CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_FILE_STORAGE=m
@@ -342,10 +336,10 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_SDIO_UART=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
 CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DRV_M41T80 is not set
 CONFIG_RTC_DRV_TPS65910=y
-# CONFIG_RTC_DRV_OMAP is not set
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
@@ -382,8 +376,11 @@ CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_DEBUG_JTAG_ENABLE=y
 CONFIG_SECURITY=y
+CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
 CONFIG_CRC_CCITT=y
@@ -391,5 +388,3 @@ CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
-CONFIG_USB_ACM=y
-CONFIG_FHANDLE=y
diff --git a/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb
index 7883cc8..fd7ccbf 100644
--- a/recipes-bsp/linux/linux-sysmocom_3.2.bb
+++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb
@@ -19,7 +19,7 @@ SRCREV_sysmocom-odu = "20547dac08c962e43a64ef5d4f182b20b2edd172"
 BRANCH_sysmocom-odu = "sob-odu/linux-3.2.63"
 LINUX_VERSION_sysmocom-odu = "3.2.63"
 
-PR = "r39"
+PR = "r40"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=${BRANCH} \