diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-10-01 10:07:32 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-10-01 10:07:32 +0000 |
| commit | 5a3991bd1a491d6fca3273c1ef72b54cdfd0661d (patch) | |
| tree | 8156c94dfbaf686c6f4d07abf0a898ddc3c3d51c /target/linux/gemini | |
| parent | 2b43a77babbe2071df374f67799679bce8216904 (diff) | |
| download | upstream-5a3991bd1a491d6fca3273c1ef72b54cdfd0661d.tar.gz upstream-5a3991bd1a491d6fca3273c1ef72b54cdfd0661d.tar.bz2 upstream-5a3991bd1a491d6fca3273c1ef72b54cdfd0661d.zip | |
kernel: upgrade to 2.6.30.8 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/gemini')
| -rw-r--r-- | target/linux/gemini/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/001-git_sync.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 0e59b51faf..2704a4e75c 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cortina Systems CS351x FEATURES:=squashfs CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time -LINUX_VERSION:=2.6.30.7 +LINUX_VERSION:=2.6.30.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/patches/001-git_sync.patch b/target/linux/gemini/patches/001-git_sync.patch index c408b6f588..2087769be1 100644 --- a/target/linux/gemini/patches/001-git_sync.patch +++ b/target/linux/gemini/patches/001-git_sync.patch @@ -66,7 +66,7 @@ +#endif #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) - #endif + /* --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -98,7 +98,7 @@ static inline int dma_set_mask(struct de @@ -308,7 +308,7 @@ __initramfs_start = .; usr/built-in.o(.init.ramfs) __initramfs_end = .; -@@ -165,13 +166,13 @@ SECTIONS +@@ -153,13 +154,13 @@ SECTIONS /* * then the cacheline aligned data */ @@ -4617,7 +4617,7 @@ +}; --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h -@@ -541,7 +541,12 @@ static inline unsigned int +@@ -543,7 +543,12 @@ static inline unsigned int ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) { if (ehci_is_TDI(ehci)) { @@ -4714,7 +4714,7 @@ /* generic layer kills/unlinks all urbs, then * uses ehci_stop to clean up the rest */ -@@ -1042,6 +1052,11 @@ MODULE_LICENSE ("GPL"); +@@ -1045,6 +1055,11 @@ MODULE_LICENSE ("GPL"); #define PCI_DRIVER ehci_pci_driver #endif |