]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Mar 2014 23:22:24 +0000 (00:22 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Mar 2014 23:22:24 +0000 (00:22 +0100)
1  2 
lfs/linux

diff --combined lfs/linux
index 7d08e6baa4530c21794469ba7eb3cc4d3529da99,7ffb345e8219da7871b1973771e96103f374ff43..687de3634f6f6942cdb43f66d0364a3710efe618
+++ b/lfs/linux
@@@ -127,9 -127,6 +127,6 @@@ ifneq "$(KCFG)" "-headers
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
  endif
  
-       # Disable pcspeaker autoload
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.30-no-pcspkr-modalias.patch
        # Remove ACPI Blacklist message
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6-silence-acpi-blacklist.patch
  
        # cs5535audio spams syslog if no ac97 was present (geos router)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
  
 +      # Add PC Engines APU led support
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch
 +
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch