aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-12-14 16:41:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-12-14 16:41:33 +0000
commitd78864ef7c7b550de88f8494fed22bf6854c6627 (patch)
tree1a38200fe1a33cb965650ca687167175938fbedd /target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch
parent881d8c8f18644c9dbebd14b0783ee56782964bce (diff)
downloadupstream-d78864ef7c7b550de88f8494fed22bf6854c6627.tar.gz
upstream-d78864ef7c7b550de88f8494fed22bf6854c6627.tar.bz2
upstream-d78864ef7c7b550de88f8494fed22bf6854c6627.zip
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch')
-rw-r--r--target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch
index 0a7c9ffc38..c9859e2f29 100644
--- a/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch
+++ b/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch
@@ -1,6 +1,6 @@
-diff -ruN linux-2.6.17-orig/include/asm-powerpc/segment.h linux-2.6.17/include/asm-powerpc/segment.h
---- linux-2.6.17-orig/include/asm-powerpc/segment.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.17/include/asm-powerpc/segment.h 2006-06-18 03:49:35.000000000 +0200
+diff -urN linux-2.6.19.old/include/asm-powerpc/segment.h linux-2.6.19.dev/include/asm-powerpc/segment.h
+--- linux-2.6.19.old/include/asm-powerpc/segment.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.19.dev/include/asm-powerpc/segment.h 2006-12-14 03:13:59.000000000 +0100
@@ -0,0 +1,6 @@
+#ifndef _ASM_SEGMENT_H
+#define _ASM_SEGMENT_H