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

[openwrt.git] / target / linux / s3c24xx / patches-2.6.30 / 053-glamo.patch

diff --git a/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch b/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch
index eb6800c..f756e9f 100644 (file)
--- a/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch
@@ -19,13 +19,3 @@
  
  obj-$(CONFIG_HTC_EGPIO)               += htc-egpio.o
  obj-$(CONFIG_HTC_PASIC3)      += htc-pasic3.o
  
  obj-$(CONFIG_HTC_EGPIO)               += htc-egpio.o
  obj-$(CONFIG_HTC_PASIC3)      += htc-pasic3.o

---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52   /* Trident Blade3D              */
- #define FB_ACCEL_TRIDENT_BLADEXP 53   /* Trident BladeXP              */
- #define FB_ACCEL_CIRRUS_ALPINE   53   /* Cirrus Logic 543x/544x/5480  */
-+#define FB_ACCEL_GLAMO                50      /* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90   /* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91   /* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92   /* NeoMagic NM2093              */