diff options
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
-rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f4d79268a2..30237d73da 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -148,7 +148,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244" -SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e" +SRCREV_pn-linux-openmoko-2.6.32 ?= "04697d0e4011a0f2942411acff56f9bc9ca6c11a" SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40" 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 38992396d1..0bfcefb4c8 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.2 -# Mon Dec 28 12:30:05 2009 +# Linux kernel version: 2.6.32.5 +# Sat Jan 23 23:17:52 2010 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -339,7 +339,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="unused -- bootloader passes ATAG list debug " +CONFIG_CMDLINE="unused -- bootloader passes ATAG list quiet " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -949,6 +949,7 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set +CONFIG_GPIO_PCF50633=y # # PCI GPIO expanders: @@ -1019,7 +1020,6 @@ CONFIG_MFD_CORE=y CONFIG_MFD_PCF50633=y # CONFIG_MFD_MC13783 is not set CONFIG_PCF50633_ADC=y -CONFIG_PCF50633_GPIO=y # CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set CONFIG_MFD_GLAMO=y |