[kernel] r17840 - in dists/trunk/linux-2.6/debian: . config/mips

[Aurelien Jarno]

Author: aurel32
Date: Thu Jul 21 21:26:03 2011
New Revision: 17840

Log:
* [mips/octeon] Disable MEGARAID_SAS, SUSPEND, HIBERNATION, PM_RUNTIME.
    Enable FUSION, FUSION_SAS.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.octeon

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jul 21 21:17:37 2011	(r17839)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jul 21 21:26:03 2011	(r17840)
@@ -21,6 +21,10 @@
 
   [ Arnaud Patard ]
   * Merge ixp4xx build fix and enable ixp4xx back
+ 
+  [ Aurelien Jarno ]
+  * [mips/octeon] Disable MEGARAID_SAS, SUSPEND, HIBERNATION, PM_RUNTIME.
+    Enable FUSION, FUSION_SAS.
 
  -- maximilian attems <maks at debian.org>  Tue, 05 Jul 2011 14:25:29 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon	Thu Jul 21 21:17:37 2011	(r17839)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon	Thu Jul 21 21:26:03 2011	(r17840)
@@ -58,9 +58,16 @@
 CONFIG_MOUSE_PS2=y
 
 ##
+## file drivers/message/fusion
+##
+CONFIG_FUSION=y
+CONFIG_FUSION_SAS=y
+
+##
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 
@@ -92,11 +99,6 @@
 CONFIG_BLK_DEV_SD=y
 
 ##
-## file: drivers/scsi/megaraid/Kconfig.megaraid
-##
-CONFIG_MEGARAID_SAS=y
-
-##
 ## file: drivers/staging/octeon/Kconfig
 ##
 CONFIG_OCTEON_ETHERNET=m
@@ -120,6 +122,13 @@
 CONFIG_EXT3_FS=y
 
 ##
+## file: kernel/power/Kconfig
+##
+# CONFIG_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+
+##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model