[kernel] r18736 - in dists/sid/linux-2.6/debian: . config config/armel

[Bastian Blank]

Author: waldi
Date: Sun Feb 26 10:23:01 2012
New Revision: 18736

Log:
Remove IDE trigger for LED support.

* debian/changelog: Update.
* debian/config/config, debian/config/armel/config.iop32x:
  Remove LEDS_TRIGGER_IDE_DISK.
* debian/config/defines: Ignore ABI change.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/armel/config.iop32x
   dists/sid/linux-2.6/debian/config/config
   dists/sid/linux-2.6/debian/config/defines

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Feb 25 18:27:07 2012	(r18735)
+++ dists/sid/linux-2.6/debian/changelog	Sun Feb 26 10:23:01 2012	(r18736)
@@ -29,6 +29,7 @@
   * [m68k,mips,mipsel] Don't built-in ramdisk support.
   * [hppa,mips,mipsel] Don't built-in cramfs support.
   * [alpha,hppa] Don't built-in ext2.
+  * Remove IDE trigger for LED support.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 17 Feb 2012 03:29:39 +0000
 

Modified: dists/sid/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.iop32x	Sat Feb 25 18:27:07 2012	(r18735)
+++ dists/sid/linux-2.6/debian/config/armel/config.iop32x	Sun Feb 26 10:23:01 2012	(r18736)
@@ -259,7 +259,6 @@
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_PCA9532=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 
 ##
 ## file: drivers/media/Kconfig

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Sat Feb 25 18:27:07 2012	(r18735)
+++ dists/sid/linux-2.6/debian/config/config	Sun Feb 26 10:23:01 2012	(r18736)
@@ -868,7 +868,6 @@
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Sat Feb 25 18:27:07 2012	(r18735)
+++ dists/sid/linux-2.6/debian/config/defines	Sun Feb 26 10:23:01 2012	(r18736)
@@ -6,6 +6,7 @@
  fixed_phy_set_link_update
 # Assume no-one is shipping OOT IDE drivers in 2012
  module:drivers/ide/*
+ ledtrig_ide_activity
 
 [base]
 arches: