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:
b1fb0fb
)
[kernel] refresh 2.6.27 patches based on -rc8
author
Gabor Juhos
<juhosg@openwrt.org>
Sun, 5 Oct 2008 06:26:28 +0000
(06:26 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Sun, 5 Oct 2008 06:26:28 +0000
(06:26 +0000)
SVN-Revision: 12858
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
patch
|
blob
|
history
target/linux/ixp4xx/config-2.6.27
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index ad7f06e492bbc86ac1e9611d117da7bf7ade416c..99c4d02669660cbc59286ac2d0df17a68c8bfee0 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-28,8
+28,8
@@
endif
ifeq ($(LINUX_VERSION),2.6.26.5)
LINUX_KERNEL_MD5SUM:=98261b39a558cf0739703ffea7db9f43
endif
ifeq ($(LINUX_VERSION),2.6.26.5)
LINUX_KERNEL_MD5SUM:=98261b39a558cf0739703ffea7db9f43
endif
-ifeq ($(LINUX_VERSION),2.6.27-rc
7
)
- LINUX_KERNEL_MD5SUM:=
39c859ea15b96b30de63305008a39ab1
+ifeq ($(LINUX_VERSION),2.6.27-rc
8
)
+ LINUX_KERNEL_MD5SUM:=
0fe739abe48e834a2ba664a2601328e6
endif
# disable the md5sum check for unknown kernel versions
endif
# disable the md5sum check for unknown kernel versions
diff --git
a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
index 142d3c0b2c7f55ae5efc0b698512f1ee8f49c87d..7f64e37ca9b3f092fc41d6ed90048999aef83604 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
+++ b/
target/linux/generic-2.6/patches-2.6.27/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>
-@@ -162
3,7 +1626
,11 @@
+@@ -162
4,7 +1627
,11 @@
struct netdev_queue *txq)
{
if (likely(!skb->next)) {
struct netdev_queue *txq)
{
if (likely(!skb->next)) {
diff --git
a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
index 1640e07830c507776e6da98fe9a30b85b7df758d..ec1d87aea8f0ad073667911be38f86549d943149 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
+++ b/
target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
@@
-8,7
+8,7
@@
static int debug;
/* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
static int debug;
/* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -83
3,7 +834
,7 @@
+@@ -83
5,7 +836
,7 @@
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}
@@
-17,7
+17,7
@@
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -125
3,3 +1254
,5 @@
+@@ -125
5,3 +1256
,5 @@
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git
a/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
b/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
index 6be8e26d7de548d91111c1cec8242e09ea1e2327..f9efb76a1b2eb72bb57016025a840477247f1645 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
+++ b/
target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
@@
-362,7
+362,7
@@
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
--- a/MAINTAINERS
+++ b/MAINTAINERS
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -385
4,6 +3854
,11 @@
+@@ -385
5,6 +3855
,11 @@
W: http://www.ibm.com/developerworks/power/cell/
S: Supported
W: http://www.ibm.com/developerworks/power/cell/
S: Supported
diff --git
a/target/linux/ixp4xx/config-2.6.27
b/target/linux/ixp4xx/config-2.6.27
index f0f2937dbdb9404bf2e14762896971d215e5bcb2..b0241a85b95c05ee65edc048e8d6e3670a5d09fc 100644
(file)
--- a/
target/linux/ixp4xx/config-2.6.27
+++ b/
target/linux/ixp4xx/config-2.6.27
@@
-96,16
+96,12
@@
CONFIG_DEFAULT_TCP_CONG="westwood"
# CONFIG_DEFAULT_VEGAS is not set
CONFIG_DEFAULT_WESTWOOD=y
CONFIG_DEVPORT=y
# CONFIG_DEFAULT_VEGAS is not set
CONFIG_DEFAULT_WESTWOOD=y
CONFIG_DEVPORT=y
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
# CONFIG_DM9000 is not set
CONFIG_DMABOUNCE=y
CONFIG_DMABOUNCE_DEBUG=y
# CONFIG_DMADEVICES is not set
CONFIG_DNOTIFY=y
# CONFIG_DM9000 is not set
CONFIG_DMABOUNCE=y
CONFIG_DMABOUNCE_DEBUG=y
# CONFIG_DMADEVICES is not set
CONFIG_DNOTIFY=y
-# CONFIG_DSCC4 is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FARSYNC is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
CONFIG_FIRMWARE_IN_KERNEL=y
# CONFIG_FPE_FASTFPE is not set
# CONFIG_FPE_NWFPE is not set
@@
-163,7
+159,6
@@
CONFIG_IP_PIMSM_V2=y
# CONFIG_ISDN is not set
# CONFIG_IWMMXT is not set
CONFIG_IXP4XX_ETH=y
# CONFIG_ISDN is not set
# CONFIG_IWMMXT is not set
CONFIG_IXP4XX_ETH=y
-# CONFIG_IXP4XX_HSS is not set
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_QMGR=y
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_QMGR=y
@@
-265,6
+260,7
@@
CONFIG_MTD_REDBOOT_PARTS_READONLY=y
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_NATSEMI is not set
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_NATSEMI is not set
+CONFIG_NF_CT_ACCT=y
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_ISO8859_1 is not set
@@
-277,7
+273,6
@@
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PATA_ARTOP=m
CONFIG_PATA_IXP4XX_CF=m
# CONFIG_PATA_SCH is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_IXP4XX_CF=m
# CONFIG_PATA_SCH is not set
-# CONFIG_PC300 is not set
CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
# CONFIG_R6040 is not set
CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
# CONFIG_R6040 is not set
@@
-321,9
+316,7
@@
CONFIG_SENSORS_W83781D=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SHMEM is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SHMEM is not set
-CONFIG_SLAB=y
CONFIG_SLABINFO=y
CONFIG_SLABINFO=y
-# CONFIG_SLUB is not set
# CONFIG_SND_ARM is not set
CONFIG_SND_DRIVERS=y
CONFIG_SND_USB=y
# CONFIG_SND_ARM is not set
CONFIG_SND_DRIVERS=y
CONFIG_SND_USB=y
@@
-361,6
+354,9
@@
CONFIG_VECTORS_BASE=0xffff0000
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
CONFIG_VIA_VELOCITY=m
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
CONFIG_VIA_VELOCITY=m
+CONFIG_VIDEO_MEDIA=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_COMMON=m
# CONFIG_VLAN_8021Q_GVRP is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_XFRM_IPCOMP=m
# CONFIG_VLAN_8021Q_GVRP is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_XFRM_IPCOMP=m