diff options
author | Thomas Kunze <thommycheck@gmx.de> | 2008-03-28 17:03:37 +0000 |
---|---|---|
committer | Thomas Kunze <thommycheck@gmx.de> | 2008-03-28 17:03:37 +0000 |
commit | 60e75ce2dd9170eba0d649ca7a5cd1f9a5f19a64 (patch) | |
tree | 30d69a5fbb55c043934c5f8297dde097899d2fee /packages | |
parent | f54bd12991023b60209135e7e77b86afa2b80b76 (diff) | |
parent | 0ab366f210214e0eb0f31fac515bc9d223d9bfc9 (diff) |
merge of 'a91112c3e784fea18d755b2f4d125e144e41fdc8'
and 'fc4b712c9e56d0a95e47daae16669dc117b1d181'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/linux/linux-rp-2.6.24/defconfig-collie | 6 | ||||
-rw-r--r-- | packages/linux/linux-rp.inc | 1 | ||||
-rw-r--r-- | packages/linux/linux-rp_2.6.24.bb | 25 |
3 files changed, 16 insertions, 16 deletions
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie index a29a12de45..91f09dff49 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-collie +++ b/packages/linux/linux-rp-2.6.24/defconfig-collie @@ -825,7 +825,7 @@ CONFIG_SPI_MASTER=y # SPI Master Controller Drivers # # CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_LOCOMO is not set +CONFIG_SPI_LOCOMO=m # # SPI Protocol Masters @@ -1014,8 +1014,8 @@ CONFIG_HID=m # CONFIG_HIDRAW is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=m -CONFIG_MMC_DEBUG=y -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD Card Drivers diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index a8980ab06e..a45ae9f2a2 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -58,6 +58,7 @@ module_autoload_snd-soc-poodle_poodle = "snd-soc-poodle" module_autoload_locomo-spi_collie = "locomo-spi" module_autoload_mmc_block_collie = "mmc_block" +module_autoload_mmc_spi = "mmc-spi" module_autoload_locomokbd_collie = "locomokbd" module_autoload_sa1100-cs_collie = "sa1100_cs" module_autoload_collie-ts_collie = "collie-ts" diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 32a3b0544e..a650a31743 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -82,24 +82,23 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ # Disabled until I find the reason this gives issues with cdc_subset # ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ -# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) -# (Pavel Machek's git tree has updated versions of this?) -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 -# These patches are extracted from Pavel Machek's git tree -# (diff against vanilla kernel) SRC_URI_append_collie = "\ - ${TKSRC}/mtd-sharp-flash-hack-r3.patch;patch=1 \ + ${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1 \ ${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \ - ${TKSRC}/locomo-r0.patch;patch=1 \ -# ${TKSRC}/locomo_spi-4.patch;patch=1 \ - ${TKSRC}/collie-kexec.patch;patch=1 \ - ${TKSRC}/sharpsl_pm-3.patch;patch=1 \ - ${TKSRC}/collie_pm-2.patch;patch=1 \ - ${TKSRC}/locomokeyb_suspendkey-2.patch;patch=1 \ + ${TKSRC}/locomo-r1.patch;patch=1 \ + ${TKSRC}/collie-kexec-r1.patch;patch=1 \ + ${TKSRC}/sharpsl_pm-4.patch;patch=1 \ + ${TKSRC}/collie_pm-3.patch;patch=1 \ ${TKSRC}/ucb1x00_suspend.patch;patch=1 \ ${TKSRC}/collie-ts.patch;patch=1 \ ${TKSRC}/pcmcia_suspend.patch;patch=1 \ + ${TKSRC}/locomo_spi-6.patch;patch=1 \ + ${TKSRC}/config.patch;patch=1 \ + ${TKSRC}/locomokeyb.patch;patch=1 \ + ${TKSRC}/mmc-spi.patch;patch=1 \ + ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \ + ${TKSRC}/sa1100_spinlock.patch;patch=1 \ " SRC_URI_append_poodle = "\ |