diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-10-30 00:16:40 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-30 00:16:40 +0000 |
| commit | e0459172b694c509094b311c34359b660fd50caf (patch) | |
| tree | 46d2be0ea9b623e05ace3f9cabb4dbc61a1fb8a2 | |
| parent | f65b1c55cc05fb43463d7e1c9925de56b87bda27 (diff) | |
| parent | de37cab1dfac476a934ffb49cb711e851aa45191 (diff) | |
merge of 8bfbc13386e9803228f6e1221669b7cb6a379c18
and ee91eab40e16fd26e3a706434e40d97953ccc457
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.14-rc4.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 index e1f54c8d73..d6444b4058 100644 --- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 @@ -1078,7 +1078,7 @@ CONFIG_SND_PXA2xx_SOC_I2S=m # Soc Codecs # # CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8750 is not set +CONFIG_SND_SOC_WM8750=m # CONFIG_SND_SOC_WM8753 is not set # CONFIG_SND_SOC_WM9713_VOICE is not set diff --git a/packages/linux/linux-openzaurus_2.6.14-rc4.bb b/packages/linux/linux-openzaurus_2.6.14-rc4.bb index 569450fb40..da1553887a 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc4.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc4.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -26,11 +26,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm-r9.patch;patch=1 \ ${RPSRC}/corgi_pm-r4.patch;patch=1 \ - ${RPSRC}/spitz_base_extras-r4.patch;patch=1 \ + ${RPSRC}/spitz_base_extras-r5.patch;patch=1 \ ${RPSRC}/spitz_pm-r5.patch;patch=1 \ ${RPSRC}/spitz_cf-r4.patch;patch=1 \ ${RPSRC}/akita_mtd_fix-r0.patch;patch=1 \ - ${RPSRC}/max7310-r0.patch;patch=1 \ + ${RPSRC}/max7310-r1.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_irda-r5.patch;patch=1 \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ @@ -64,8 +64,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/alsa/alsa_soc-r3.patch;patch=1 \ + ${RPSRC}/alsa/alsa_soc-r3_1.patch;patch=1 \ ${RPSRC}/alsa/ssp_pxa_regs-r0.patch;patch=1 \ - ${RPSRC}/wm8731-r2.patch;patch=1 \ + ${RPSRC}/wm8731-r4.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ |