diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-10-01 10:07:32 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-10-01 10:07:32 +0000 |
| commit | 054c54512f1120f037142964b0e51190d11b8904 (patch) | |
| tree | 739640bd2b5935e5efdaa70d2e3208ae8a3775af /target/linux/ps3 | |
| parent | b2334452229f1ac2e246f37452b9611f3dab159e (diff) | |
| download | upstream-054c54512f1120f037142964b0e51190d11b8904.tar.gz upstream-054c54512f1120f037142964b0e51190d11b8904.tar.bz2 upstream-054c54512f1120f037142964b0e51190d11b8904.zip | |
kernel: upgrade to 2.6.30.8 and refresh patches
SVN-Revision: 17804
Diffstat (limited to 'target/linux/ps3')
| -rw-r--r-- | target/linux/ps3/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile index 633dc99d5b..832dd43d23 100644 --- a/target/linux/ps3/Makefile +++ b/target/linux/ps3/Makefile @@ -13,7 +13,7 @@ MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com> SUBTARGETS=petitboot FEATURES+=powerpc64 -LINUX_VERSION:=2.6.30.7 +LINUX_VERSION:=2.6.30.8 KERNEL_CC:= diff --git a/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch b/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch index 00204e374e..1cb202d4f5 100644 --- a/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch +++ b/target/linux/ps3/patches-2.6.30/0016-ps3-gelic-fix-rxdmac.patch @@ -28,7 +28,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c -@@ -970,10 +970,6 @@ static int gelic_card_decode_one_descr(s +@@ -969,10 +969,6 @@ static int gelic_card_decode_one_descr(s int dmac_chain_ended; status = gelic_descr_get_status(descr); @@ -39,7 +39,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> if (status == GELIC_DESCR_DMA_CARDOWNED) return 0; -@@ -1036,6 +1032,11 @@ static int gelic_card_decode_one_descr(s +@@ -1035,6 +1031,11 @@ static int gelic_card_decode_one_descr(s /* ok, we've got a packet in descr */ gelic_net_pass_skb_up(descr, card, netdev); refill: @@ -51,7 +51,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> /* * So that always DMAC can see the end * of the descriptor chain to avoid -@@ -1064,10 +1065,9 @@ refill: +@@ -1063,10 +1064,9 @@ refill: * If dmac chain was met, DMAC stopped. * thus re-enable it */ @@ -65,7 +65,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> return 1; } -@@ -1133,11 +1133,6 @@ static irqreturn_t gelic_card_interrupt( +@@ -1132,11 +1132,6 @@ static irqreturn_t gelic_card_interrupt( status &= card->irq_mask; |