diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-10-28 05:18:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-28 05:18:58 +0000 |
| commit | d4fe48e910d486f6e2d7216544ef9b71a07d5a6f (patch) | |
| tree | 1039d94158e11f19a2023512d4732925d559d79e | |
| parent | 250547d96937fe646f47c8193dca78054ecdfc13 (diff) | |
| parent | 80d745db67f9f8eae23f39aad398d44aab440f75 (diff) | |
merge of 749a74b807f23c00b9560c4ea5e45c3bdd945ae9
and d5f672b215553b0622c8ee9a8ee627e900ab92e4
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 | 7 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.14-rc4.bb | 12 |
2 files changed, 11 insertions, 8 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 61018b1a82..e1f54c8d73 100644 --- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 @@ -99,7 +99,7 @@ CONFIG_PXA_SHARPSL=y # CONFIG_MACH_HX2750 is not set # CONFIG_PXA_SHARPSL_25x is not set CONFIG_PXA_SHARPSL_27x=y -# CONFIG_MACH_AKITA is not set +CONFIG_MACH_AKITA=y CONFIG_MACH_SPITZ=y CONFIG_MACH_BORZOI=y # CONFIG_MACH_TOSA is not set @@ -868,7 +868,7 @@ CONFIG_SA1100_RTC=y # # I2C support # -CONFIG_I2C=m +CONFIG_I2C=y # CONFIG_I2C_CHARDEV is not set # @@ -881,7 +881,7 @@ CONFIG_I2C=m # # I2C Hardware Bus support # -CONFIG_I2C_PXA=m +CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set @@ -898,6 +898,7 @@ CONFIG_I2C_PXA=m # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set +CONFIG_MAX7310=y # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS 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 c0b2c8ec4b..569450fb40 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 = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -26,9 +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-r3.patch;patch=1 \ - ${RPSRC}/spitz_pm-r4.patch;patch=1 \ - ${RPSRC}/spitzcf-r3.patch;patch=1 \ + ${RPSRC}/spitz_base_extras-r4.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}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_irda-r5.patch;patch=1 \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ @@ -63,7 +65,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/alsa/alsa_soc-r3.patch;patch=1 \ ${RPSRC}/alsa/ssp_pxa_regs-r0.patch;patch=1 \ - ${RPSRC}/wm8731-r1.patch;patch=1 \ + ${RPSRC}/wm8731-r2.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 \ |