projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b043b26
)
kernel: update to kernel version 3.0.1
author
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 6 Aug 2011 09:51:55 +0000
(09:51 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 6 Aug 2011 09:51:55 +0000
(09:51 +0000)
SVN-Revision: 27918
12 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/brcm47xx/Makefile
patch
|
blob
|
history
target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
patch
|
blob
|
history
target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
patch
|
blob
|
history
target/linux/generic/patches-3.0/642-bridge_port_isolate.patch
patch
|
blob
|
history
target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
patch
|
blob
|
history
target/linux/generic/patches-3.0/950-vm_exports.patch
patch
|
blob
|
history
target/linux/malta/Makefile
patch
|
blob
|
history
target/linux/orion/Makefile
patch
|
blob
|
history
target/linux/ppc40x/Makefile
patch
|
blob
|
history
target/linux/ppc44x/Makefile
patch
|
blob
|
history
target/linux/realview/Makefile
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 4fd3207a7d5c398a715492dcd915342a6709924d..6161d122fd267234a383b082c76ed322a318d08c 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-29,8
+29,8
@@
endif
ifeq ($(LINUX_VERSION),2.6.39.2)
LINUX_KERNEL_MD5SUM:=51be93d92028658ec93f68b79a378b17
endif
ifeq ($(LINUX_VERSION),2.6.39.2)
LINUX_KERNEL_MD5SUM:=51be93d92028658ec93f68b79a378b17
endif
-ifeq ($(LINUX_VERSION),3.0)
- LINUX_KERNEL_MD5SUM:=
398e95866794def22b12dfbc15ce89c0
+ifeq ($(LINUX_VERSION),3.0
.1
)
+ LINUX_KERNEL_MD5SUM:=
aed949984b878b7fb77ffe9cbee8ce0c
endif
# disable the md5sum check for unknown kernel versions
endif
# disable the md5sum check for unknown kernel versions
diff --git
a/target/linux/brcm47xx/Makefile
b/target/linux/brcm47xx/Makefile
index 969dfe2ce7537dd9d39373f7705c2426215d0227..167d9e4ecb469e29458e13687e68179328120378 100644
(file)
--- a/
target/linux/brcm47xx/Makefile
+++ b/
target/linux/brcm47xx/Makefile
@@
-11,7
+11,7
@@
BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0
.1
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
diff --git
a/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
b/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
index d236fcbbbe4aea1344f8ffcd248bd8e3fa1ba15f..bd5158754330ddb53301257e04567e8dd93e0299 100644
(file)
--- a/
target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
+++ b/
target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
@@
-22,7
+22,7
@@
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -128
6,9 +1286
,14 @@ MODULE_LICENSE ("GPL");
+@@ -128
4,9 +1284
,14 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_grlib_driver
#endif
#define PLATFORM_DRIVER ehci_grlib_driver
#endif
@@
-38,7
+38,7
@@
#error "missing bus glue for ehci-hcd"
#endif
#error "missing bus glue for ehci-hcd"
#endif
-@@ -134
8,10 +1353
,20 @@ static int __init ehci_hcd_init(void)
+@@ -134
6,10 +1351
,20 @@ static int __init ehci_hcd_init(void)
if (retval < 0)
goto clean4;
#endif
if (retval < 0)
goto clean4;
#endif
@@
-60,7
+60,7
@@
clean4:
#endif
#ifdef OF_PLATFORM_DRIVER
clean4:
#endif
#ifdef OF_PLATFORM_DRIVER
-@@ -138
2,6 +1397
,9 @@ module_init(ehci_hcd_init);
+@@ -138
0,6 +1395
,9 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
static void __exit ehci_hcd_cleanup(void)
{
diff --git
a/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
b/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
index a3ec2b70d02d1041777e7bbf895f841f7617b4f8..ed444548be91cd3f89aac1c26edd450ab448ed0a 100644
(file)
--- a/
target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
+++ b/
target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
@@
-152,7
+152,7
@@
+#endif
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
+#endif
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -135
4,17 +1354
,21 @@ static int __init ehci_hcd_init(void)
+@@ -135
2,17 +1352
,21 @@ static int __init ehci_hcd_init(void)
goto clean4;
#endif
goto clean4;
#endif
@@
-174,7
+174,7
@@
#ifdef XILINX_OF_PLATFORM_DRIVER
platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
clean4:
#ifdef XILINX_OF_PLATFORM_DRIVER
platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
clean4:
-@@ -139
7,9 +1401
,11 @@ module_init(ehci_hcd_init);
+@@ -139
5,9 +1399
,11 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
static void __exit ehci_hcd_cleanup(void)
{
diff --git
a/target/linux/generic/patches-3.0/642-bridge_port_isolate.patch
b/target/linux/generic/patches-3.0/642-bridge_port_isolate.patch
index 1964e1893cf5455b58da4a67efdcfcb6b7cfc13a..a1214c134b4e8aad2ae1139db3d8542644406c0f 100644
(file)
--- a/
target/linux/generic/patches-3.0/642-bridge_port_isolate.patch
+++ b/
target/linux/generic/patches-3.0/642-bridge_port_isolate.patch
@@
-1,6
+1,6
@@
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -13
3,6 +133
,7 @@ struct net_bridge_port
+@@ -13
4,6 +134
,7 @@ struct net_bridge_port
unsigned long flags;
#define BR_HAIRPIN_MODE 0x00000001
unsigned long flags;
#define BR_HAIRPIN_MODE 0x00000001
diff --git
a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
index 7561c3b0689027d9c2bc620684016d9371ace48e..1a003ee3ccad381e0a19ed56b30271c0908a545e 100644
(file)
--- a/
target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
+++ b/
target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
@@
-1,7
+1,7
@@
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
-@@ -42
7,6 +427
,8 @@ reset_needed:
+@@ -42
9,6 +429
,8 @@ reset_needed:
}
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
}
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
@@
-10,7
+10,7
@@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -8
41,3 +843
,5 @@ static void __devinit quirk_usb_early_ha
+@@ -8
69,3 +871
,5 @@ static void __devinit quirk_usb_early_ha
quirk_usb_handoff_xhci(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
quirk_usb_handoff_xhci(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
diff --git
a/target/linux/generic/patches-3.0/950-vm_exports.patch
b/target/linux/generic/patches-3.0/950-vm_exports.patch
index a37be04e177765d30b7245692b1b0cb27b097433..e1b88a0bb1cdf4719fb804cd90786c025708c062 100644
(file)
--- a/
target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/
target/linux/generic/patches-3.0/950-vm_exports.patch
@@
-79,7
+79,7
@@
/**
* zap_vma_ptes - remove ptes mapping the vma
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -30
15,6 +3016
,7 @@ static inline int check_stack_guard_page
+@@ -30
71,6 +3072
,7 @@ static inline int check_stack_guard_page
}
return 0;
}
}
return 0;
}
diff --git
a/target/linux/malta/Makefile
b/target/linux/malta/Makefile
index 4fbdf49d1102a998d515284e1e14fcbd2844feaa..8f64714f306d4f4bea287fb2852930910ef83566 100644
(file)
--- a/
target/linux/malta/Makefile
+++ b/
target/linux/malta/Makefile
@@
-13,7
+13,7
@@
SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0
.1
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/orion/Makefile
b/target/linux/orion/Makefile
index 49e9ecb34780592f156fa6dcc91873c58a0e075d..a8201f57eacb0091760d02076f2a9fb89fad6e67 100644
(file)
--- a/
target/linux/orion/Makefile
+++ b/
target/linux/orion/Makefile
@@
-13,7
+13,7
@@
SUBTARGETS:=generic harddisk
CFLAGS=-Os -pipe -march=armv5te -mtune=xscale -fno-caller-saves
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS=-Os -pipe -march=armv5te -mtune=xscale -fno-caller-saves
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0
.1
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ppc40x/Makefile
b/target/linux/ppc40x/Makefile
index 59db6ef45abdefe6f4bee57c820983ef9d9a1a39..ffd1b4489ad12a724dbe469a90202d0fe638ab75 100644
(file)
--- a/
target/linux/ppc40x/Makefile
+++ b/
target/linux/ppc40x/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0
.1
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ppc44x/Makefile
b/target/linux/ppc44x/Makefile
index 95f1ee631cfc03a88f0297191b72cfd7debaa9ad..8f65693dba6d715c5b2547fd3f9463e90fe24825 100644
(file)
--- a/
target/linux/ppc44x/Makefile
+++ b/
target/linux/ppc44x/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0
.1
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/realview/Makefile
b/target/linux/realview/Makefile
index 55122ca04eeb62cfaa6b6ab4cba1c4ce029d0cb9..e697ba62dfc8f84fa3d9ee5c1ffc76e9a378285d 100644
(file)
--- a/
target/linux/realview/Makefile
+++ b/
target/linux/realview/Makefile
@@
-13,7
+13,7
@@
FEATURES:=fpu ramdisk
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0
.1
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk