summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-12-15 14:48:40 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-12-15 14:48:40 +0000
commit554d8397148d6fd69fa9b73098e14835c66c71a4 (patch)
treed5032b41796ef91f67d144a0f04fd8c3ff6a96dc /target/linux
parent0d55442532a160af606a5e10d7ae1438d7d70391 (diff)
[kernel] refresh 2.6.28 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13654 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch2
4 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch
index d55eda635..6cab67a27 100644
--- a/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch
@@ -362,7 +362,7 @@
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4017,6 +4017,11 @@ M: jbglaw@lug-owl.de
+@@ -4027,6 +4027,11 @@ M: jbglaw@lug-owl.de
L: linux-kernel@vger.kernel.org
S: Maintained
diff --git a/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
index cc16a10f8..5367de872 100644
--- a/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
@@ -824,7 +824,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1910,6 +1910,11 @@ W: http://moinejf.free.fr
+@@ -1911,6 +1911,11 @@ W: http://moinejf.free.fr
L: video4linux-list@redhat.com
S: Maintained
diff --git a/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch
index 9fe19ac71..ee2cf1b31 100644
--- a/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch
@@ -1,6 +1,6 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -707,6 +707,8 @@ config CRYPTO_ANSI_CPRNG
+@@ -735,6 +735,8 @@ config CRYPTO_ANSI_CPRNG
for cryptographic modules. Uses the Algorithm specified in
ANSI X9.31 A.2.4
diff --git a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
index 162be24f5..f7924c6b1 100644
--- a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
@@ -88,7 +88,7 @@
/*********************************************************************
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -139,6 +139,7 @@ asmlinkage long sys_dup(unsigned int fil
+@@ -140,6 +140,7 @@ asmlinkage long sys_dup(unsigned int fil
}
return ret;
}