From bf844adfceada28303be7fce155b8944cc65f4c2 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurel32@debian.org>
Date: Thu, 21 Jul 2011 21:26:03 +0000
Subject: [PATCH]   * [mips/octeon] Disable MEGARAID_SAS, SUSPEND, HIBERNATION,
 PM_RUNTIME.     Enable FUSION, FUSION_SAS.

svn path=/dists/trunk/linux-2.6/; revision=17840
---
 debian/changelog                 |  4 ++++
 debian/config/mips/config.octeon | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 339d1d08d..0ba5e57c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ linux-2.6 (3.0.0~rc7-1~experimental.1) UNRELEASED; urgency=low
 
   [ 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@debian.org>  Tue, 05 Jul 2011 14:25:29 +0200
 
diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon
index 097c6a2ca..69b2cdbc2 100644
--- a/debian/config/mips/config.octeon
+++ b/debian/config/mips/config.octeon
@@ -57,10 +57,17 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_INPUT_MOUSE=y
 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
 
@@ -91,11 +98,6 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 
-##
-## file: drivers/scsi/megaraid/Kconfig.megaraid
-##
-CONFIG_MEGARAID_SAS=y
-
 ##
 ## file: drivers/staging/octeon/Kconfig
 ##
@@ -119,6 +121,13 @@ CONFIG_EXT2_FS=y
 ##
 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
 ##