replace the hostapd-mini preselection in profiles with wpad-mini

[openwrt.git] / target / linux / gemini / patches / 001-git_sync.patch

diff --git a/target/linux/gemini/patches/001-git_sync.patch b/target/linux/gemini/patches/001-git_sync.patch
index e0306e8..2087769 100644 (file)
--- 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
@@ -80,7 +80,7 @@
  static inline int dma_is_consistent(struct device *dev, dma_addr_t handle)
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -824,7 +824,7 @@ config ISA_DMA_API
+@@ -825,7 +825,7 @@ config ISA_DMA_API
        bool
  
  config PCI
@@ -189,8 +189,8 @@
        .globl  __kuser_helper_start
  __kuser_helper_start:
  
-@@ -821,7 +822,7 @@ __kuser_memory_barrier:                            @ 0xffff0fa0
- #endif
+@@ -818,7 +819,7 @@ __kuser_memory_barrier:                            @ 0xffff0fa0
+       smp_dmb
        usr_ret lr
  
 -      .align  5
@@ -198,7 +198,7 @@
  
  /*
   * Reference prototype:
-@@ -953,7 +954,7 @@ kuser_cmpxchg_fixup:
+@@ -950,7 +951,7 @@ kuser_cmpxchg_fixup:
  
  #endif
  
@@ -207,7 +207,7 @@
  
  /*
   * Reference prototype:
-@@ -1035,7 +1036,7 @@ __kuser_helper_end:
+@@ -1032,7 +1033,7 @@ __kuser_helper_end:
   * of which is copied into r0 for the mode specific abort handler.
   */
        .macro  vector_stub, name, mode, correction=0
@@ -216,7 +216,7 @@
  
  vector_\name:
        .if \correction
-@@ -1160,7 +1161,7 @@ __stubs_start:
+@@ -1157,7 +1158,7 @@ __stubs_start:
        .long   __und_invalid                   @  e
        .long   __und_invalid                   @  f
  
@@ -225,7 +225,7 @@
  
  /*=============================================================================
   * Undefined FIQs
-@@ -1190,7 +1191,7 @@ vector_addrexcptn:
+@@ -1187,7 +1188,7 @@ vector_addrexcptn:
   * We group all the following data together to optimise
   * for CPUs with separate I & D caches.
   */
@@ -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
                 */
@@ -850,7 +850,7 @@
 +#endif /* __MACH_GMAC_H__ */
 --- a/arch/arm/mach-gemini/include/mach/hardware.h
 +++ b/arch/arm/mach-gemini/include/mach/hardware.h
-@@ -72,4 +72,12 @@
+@@ -71,4 +71,12 @@
   */
  #define IO_ADDRESS(x) ((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000)
  
@@ -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