aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-04-08 17:14:43 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-04-08 17:16:42 +0200
commita84caeecc41f52314b1c55320eff26ffe459f029 (patch)
tree7ba8f837de52a421bc34a23abf89548eab615f12 /recipes/linux
parent198179be171f1fdb809bccf02c83520cb978ad33 (diff)
downloadopenembedded-a84caeecc41f52314b1c55320eff26ffe459f029.tar.gz
linux-openmoko-2.6.32: enable MMC_S3C in defconfig
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig10
-rw-r--r--recipes/linux/linux-openmoko-2.6.32_git.bb2
2 files changed, 8 insertions, 4 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
index 2f985f6726..4412af6f14 100644
--- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.10
-# Wed Mar 31 21:51:24 2010
+# Linux kernel version: 2.6.32.11
+# Thu Apr 8 17:08:39 2010
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -1370,7 +1370,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_AT91 is not set
# CONFIG_MMC_ATMELMCI is not set
# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_S3C is not set
+CONFIG_MMC_S3C=y
+# CONFIG_MMC_S3C_HW_SDIO_IRQ is not set
+CONFIG_MMC_S3C_PIO=y
+# CONFIG_MMC_S3C_DMA is not set
+# CONFIG_MMC_S3C_PIODMA is not set
# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index 9546827522..ae31010343 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE="2.6.32.11"
SRCREV = "14be1091928fcce66812a85129768fb253b36420"
OEV = "oe1"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \