diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index 77eec3905..77ea5d6f7 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -12,7 +12,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi"
 pkgver=3.18.7
-pkgrel=5
+pkgrel=6
 bfqver=v7r7
 arch=('armv6h' 'armv7h')
 url="http://www.kernel.org/"
@@ -38,8 +38,8 @@ md5sums=('be91c767e708a9a33c33280ff123e7b6'
          '405015cdeb544575c25018b3487a2e76'
          'fa4377b3247d80efade0ed3d5ec650f1'
          '60bc3624123c183305677097bcd56212'
-         '0a07aa126cfddbea561ce3b9562a3a0c'
-         '61f8f7302c3dc0d7806be88814e0b5b1')
+         '144dc3e45e267b780caa3c2ab40de0f3'
+         'cdc2baf85743c719da8ff60e80f6786d')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-raspberrypi/config.v6 b/core/linux-raspberrypi/config.v6
index 7abf1a0e5..790b28afa 100644
--- a/core/linux-raspberrypi/config.v6
+++ b/core/linux-raspberrypi/config.v6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.7-5 Kernel Configuration
+# Linux/arm 3.18.7-6 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3514,7 +3514,7 @@ CONFIG_MMC_SPI=m
 # CONFIG_MMC_USDHI6ROL0 is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
@@ -3523,7 +3523,7 @@ CONFIG_LEDS_CLASS=m
 # CONFIG_LEDS_LM3533 is not set
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
@@ -3546,19 +3546,19 @@ CONFIG_LEDS_GPIO=m
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_LEDS_TRIGGER_CAMERA=y
 CONFIG_LEDS_TRIGGER_INPUT=y
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_EDAC is not set
diff --git a/core/linux-raspberrypi/config.v7 b/core/linux-raspberrypi/config.v7
index 0b4bb1b8f..a9bdc0efd 100644
--- a/core/linux-raspberrypi/config.v7
+++ b/core/linux-raspberrypi/config.v7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.7-5 Kernel Configuration
+# Linux/arm 3.18.7-6 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3565,7 +3565,7 @@ CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
 # CONFIG_MMC_USDHI6ROL0 is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
@@ -3574,7 +3574,7 @@ CONFIG_LEDS_CLASS=m
 # CONFIG_LEDS_LM3533 is not set
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
@@ -3597,19 +3597,19 @@ CONFIG_LEDS_GPIO=m
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_LEDS_TRIGGER_CAMERA=y
 CONFIG_LEDS_TRIGGER_INPUT=y
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_EDAC is not set