diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-04-28 14:07:59 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-04-28 14:07:59 +0000 |
| commit | 20f1f851b4955613f737af5763201e1b1064b6ad (patch) | |
| tree | 8594020c59a77e8029fab9860e166ca0727c57f8 /target/linux/avr32 | |
| parent | f0c04a90e66801ed3da578088bce582403736dc0 (diff) | |
| download | upstream-20f1f851b4955613f737af5763201e1b1064b6ad.tar.gz upstream-20f1f851b4955613f737af5763201e1b1064b6ad.tar.bz2 upstream-20f1f851b4955613f737af5763201e1b1064b6ad.zip | |
fixup 2.6.24.5 on avr32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10960 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/avr32')
| -rw-r--r-- | target/linux/avr32/patches/100-git_sync.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/target/linux/avr32/patches/100-git_sync.patch b/target/linux/avr32/patches/100-git_sync.patch index 20c08cfc4a..e2cf6ca20c 100644 --- a/target/linux/avr32/patches/100-git_sync.patch +++ b/target/linux/avr32/patches/100-git_sync.patch @@ -15689,18 +15689,6 @@ diff -urN linux-2.6.24.3/drivers/mtd/chips/cfi_cmdset_0002.c avr32-2.6/drivers/m { 0, 0, NULL, NULL } }; static struct cfi_fixup jedec_fixup_table[] = { -diff -urN linux-2.6.24.3/drivers/net/macb.c avr32-2.6/drivers/net/macb.c ---- linux-2.6.24.3/drivers/net/macb.c 2008-02-26 01:20:20.000000000 +0100 -+++ avr32-2.6/drivers/net/macb.c 2008-04-23 20:12:41.000000000 +0200 -@@ -148,7 +148,7 @@ - - if (phydev->duplex) - reg |= MACB_BIT(FD); -- if (phydev->speed) -+ if (phydev->speed == SPEED_100) - reg |= MACB_BIT(SPD); - - macb_writel(bp, NCFGR, reg); diff -urN linux-2.6.24.3/drivers/pcmcia/at32_cf.c avr32-2.6/drivers/pcmcia/at32_cf.c --- linux-2.6.24.3/drivers/pcmcia/at32_cf.c 1970-01-01 01:00:00.000000000 +0100 +++ avr32-2.6/drivers/pcmcia/at32_cf.c 2008-04-23 19:33:42.000000000 +0200 |