[kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

[openwrt.git] / target / linux / s3c24xx / patches-2.6.30 / 130-fix-s3c_gpiolib_getchip.patch

diff --git a/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch b/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch
index 9673001..9e257bd 100644 (file)
--- a/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/130-fix-s3c_gpiolib_getchip.patch
@@ -1,8 +1,6 @@
-diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-core.h b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
-index 8fe1920..f8b879a 100644

 --- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h
 +++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
 --- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h
 +++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h

-@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
+@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_

                return NULL;
  
        chip = &s3c24xx_gpios[pin/32];
                return NULL;
  
        chip = &s3c24xx_gpios[pin/32];