X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgemini%2Fpatches%2F001-git_sync.patch;h=2087769be1083c9978dfbfb1ebfcd4ee078787a8;hb=e84ee90b81193c506d3004cd62e2eec1596ff203;hp=c408b6f5885fda6c73f10b53339ed08a53ca17ce;hpb=7d01bddd188fbc4bed66f137c1a1ddda572f234d;p=openwrt-10.03%2F.git

diff --git a/target/linux/gemini/patches/001-git_sync.patch b/target/linux/gemini/patches/001-git_sync.patch
index c408b6f58..2087769be 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