projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aac7bba
)
upgrade orion to 2.6.26-rc7
author
Imre Kaloz
<kaloz@openwrt.org>
Mon, 23 Jun 2008 15:07:52 +0000
(15:07 +0000)
committer
Imre Kaloz
<kaloz@openwrt.org>
Mon, 23 Jun 2008 15:07:52 +0000
(15:07 +0000)
SVN-Revision: 11569
target/linux/generic-2.6/config-2.6.26
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
patch
|
blob
|
history
target/linux/orion/Makefile
patch
|
blob
|
history
target/linux/orion/patches/060-mv643xx_git_backport.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic-2.6/config-2.6.26
b/target/linux/generic-2.6/config-2.6.26
index 5f3bc764002cb715764468bbec8339ebf53c8332..4a335278bd56afffde44dbabfdbff195835479ec 100644
(file)
--- a/
target/linux/generic-2.6/config-2.6.26
+++ b/
target/linux/generic-2.6/config-2.6.26
@@
-1153,6
+1153,7
@@
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RTC_CLASS is not set
CONFIG_RTC_DRV_CMOS=y
# CONFIG_RTC_DRV_DS1511 is not set
# CONFIG_RTC_CLASS is not set
CONFIG_RTC_DRV_CMOS=y
# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_MAX6900 is not set
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_R9701 is not set
# CONFIG_RTC_DRV_MAX6900 is not set
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_R9701 is not set
diff --git
a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
index 451dfe9c1ba426d8b9cd5ba82bf3db5d1395733e..6d7fbd585a67cb095c9a51d6e8f6180ce348a08a 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
+++ b/
target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
@@
-2027,7
+2027,7
@@
+}
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
+}
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -20
7,6 +207
,14 @@
+@@ -20
5,6 +205
,14 @@
* too. */
nf_ct_remove_expectations(ct);
* too. */
nf_ct_remove_expectations(ct);
diff --git
a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
index cd05e0f6e6e8fbe50d85478a88b3a3c5a5921a06..830fb5d80e4abe794d8f3558477b74b333ae0ec4 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
+++ b/
target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
@@
-687,7
+687,7
@@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -15
45,7 +1548
,11 @@
+@@ -15
69,7 +1572
,11 @@
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
diff --git
a/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
b/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
index cd961e5a83200c2f6c5af227c985375926c45376..17ef6c6297ec1f49f65b7099fc7ab0dba92242b0 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
+++ b/
target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -59
3,6 +593
,9 @@
+@@ -59
7,6 +597
,9 @@
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
diff --git
a/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
b/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
index 29e6167250177b529f236a8c1e2c099cd83f07e7..6ae2cd7df5d4ac477e641ce7dbdfb91fe337f92a 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
+++ b/
target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
@@
-1,6
+1,6
@@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
-@@ -19
8,4 +198
,20 @@
+@@ -19
7,4 +197
,20 @@
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
diff --git
a/target/linux/orion/Makefile
b/target/linux/orion/Makefile
index 8b18cccb17cafb1e16026e5b48597c6c0845cb91..22584e006eda041011c1f06bf1f05900a539a8ac 100644
(file)
--- a/
target/linux/orion/Makefile
+++ b/
target/linux/orion/Makefile
@@
-11,7
+11,7
@@
BOARD:=orion
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
-LINUX_VERSION:=2.6.26-rc
6
+LINUX_VERSION:=2.6.26-rc
7
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/orion/patches/060-mv643xx_git_backport.patch
b/target/linux/orion/patches/060-mv643xx_git_backport.patch
index 0b039224d53ced1b4bcb7740bee425596b7ab7c1..76eaddd4966e16f640536fec2e1942cca1205fe4 100644
(file)
--- a/
target/linux/orion/patches/060-mv643xx_git_backport.patch
+++ b/
target/linux/orion/patches/060-mv643xx_git_backport.patch
@@
-5327,7
+5327,7
@@
+#endif
--- a/MAINTAINERS
+++ b/MAINTAINERS
+#endif
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -26
89,12 +2689
,10 @@
+@@ -26
90,12 +2690
,10 @@
S: Maintained
MARVELL MV643XX ETHERNET DRIVER
S: Maintained
MARVELL MV643XX ETHERNET DRIVER