]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
kernel: updated to 3.2.29.
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 19 Sep 2012 20:35:07 +0000 (22:35 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 19 Sep 2012 20:35:07 +0000 (22:35 +0200)
lfs/linux
src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch [deleted file]

index d51c6df608c06d0e229c0ee415e15b7968ee0866..31c585f6681bae6f1f69ef96d17b931947b3d738 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER           = 3.2.28
+VER           = 3.2.29
 
 RPI_PATCHES = linux-3.2.27-091073b
 
@@ -75,7 +75,7 @@ objects =$(DL_FILE) \
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = d387130f084f48fae7b2d1756f6c9257
+$(DL_FILE)_MD5                         = 89c76e7849e6dc8288d297e1d6f03e81
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 9daec752fba403a488818df6dd57a714
 
 install : $(TARGET)
@@ -120,12 +120,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Layer7-patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netfilter_layer7_2.22_kernel3.0.patch
 
-       # Add some more LED triggers
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
-
-       # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
-
        # Fix uevent PHYSDEVDRIVER
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
diff --git a/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch b/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch
deleted file mode 100644 (file)
index b102380..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur linux-2.6.32.11.org/drivers/usb/serial/option.c linux-2.6.32.11/drivers/usb/serial/option.c
---- linux-2.6.32.11.org/drivers/usb/serial/option.c    2010-04-02 00:59:14.000000000 +0200
-+++ linux-2.6.32.11/drivers/usb/serial/option.c        2010-04-21 21:56:56.000000000 +0200
-@@ -165,6 +165,10 @@
- #define HUAWEI_PRODUCT_E143D                  0x143D
- #define HUAWEI_PRODUCT_E143E                  0x143E
- #define HUAWEI_PRODUCT_E143F                  0x143F
-+/* Vodafone K4505-H */
-+#define HUAWEI_PRODUCT_E1464                  0x1464
-+/* Vodafone K3765-H */
-+#define HUAWEI_PRODUCT_E1465                  0x1465
- #define HUAWEI_PRODUCT_E14AC                  0x14AC
- #define QUANTA_VENDOR_ID                      0x0408
-@@ -443,6 +447,8 @@
-       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
-       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
-       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
-+      { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1464, 0xff, 0xff, 0xff) },
-+      { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1465, 0xff, 0xff, 0xff) },
-       { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },
-       { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
-       { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */