diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-07-05 14:39:13 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-07-05 14:39:13 +0000 |
| commit | e25718974c62494963f4f6c5b27473125f176d4b (patch) | |
| tree | a50abe383d320a28a34e3d5def552f0d423bc638 /target/linux/kirkwood | |
| parent | 02909e5855b96fc0caf5e68ea7c145347805caeb (diff) | |
| download | upstream-e25718974c62494963f4f6c5b27473125f176d4b.tar.gz upstream-e25718974c62494963f4f6c5b27473125f176d4b.tar.bz2 upstream-e25718974c62494963f4f6c5b27473125f176d4b.zip | |
[kernel] update targets to 2.6.30.1, update patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16697 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood')
| -rw-r--r-- | target/linux/kirkwood/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/kirkwood/patches/002-mvsdio_delay.patch | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 48c173ab72..e6bbef259b 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -11,7 +11,7 @@ BOARD:=kirkwood BOARDNAME:=Marvell Kirkwood FEATURES:=tgz usb -LINUX_VERSION:=2.6.30 +LINUX_VERSION:=2.6.30.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/patches/002-mvsdio_delay.patch b/target/linux/kirkwood/patches/002-mvsdio_delay.patch index ee730306aa..3f7c56e032 100644 --- a/target/linux/kirkwood/patches/002-mvsdio_delay.patch +++ b/target/linux/kirkwood/patches/002-mvsdio_delay.patch @@ -16,20 +16,6 @@ err = mmc_sd_switch(card, 1, 0, 1, status); if (err) goto out; ---- a/drivers/mmc/host/mvsdio.c -+++ b/drivers/mmc/host/mvsdio.c -@@ -620,9 +620,11 @@ static void mvsd_set_ios(struct mmc_host - if (ios->bus_width == MMC_BUS_WIDTH_4) - ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS; - -+#if 0 - if (ios->timing == MMC_TIMING_MMC_HS || - ios->timing == MMC_TIMING_SD_HS) - ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN; -+#endif - - host->ctrl = ctrl_reg; - mvsd_write(MVSD_HOST_CTRL, ctrl_reg); --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -286,9 +286,9 @@ void mmc_set_data_timeout(struct mmc_dat |