Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <meissner@suse.de>2011-07-25 08:57:43 +0200
committerMichal Marek <mmarek@suse.cz>2011-07-27 11:44:31 +0200
commitaa27d23f08e73f9bf75572c08baa19d5d40baea3 (patch)
tree2cf7f95740fa91453d5bf7a5521a322c81446156
parentb5f5212a1290cd15095bf983c177f53fe93f3788 (diff)
Powerpc config adjustments
This makes CONFIG_POWER_SUPPLY=y like in the other architectures, it also disables the EHCA driver as gcc 4.6 currently fails to compile it correctly.
-rw-r--r--config/ppc/default2
-rw-r--r--config/ppc/ppc644
-rw-r--r--config/ppc/vanilla2
-rw-r--r--config/ppc64/debug2
-rw-r--r--config/ppc64/default2
-rw-r--r--config/ppc64/ppc642
-rw-r--r--config/ppc64/trace2
-rw-r--r--config/ppc64/vanilla2
8 files changed, 9 insertions, 9 deletions
diff --git a/config/ppc/default b/config/ppc/default
index a5306f7500..fdada25eca 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -2580,7 +2580,7 @@ CONFIG_W1_SLAVE_DS2433_CRC=y
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_APM_POWER=m
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index 821fdc2643..b45fb1908f 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -2582,7 +2582,7 @@ CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_WM831X_BACKUP=m
@@ -3917,7 +3917,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_MTHCA_DEBUG=y
CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_EHCA=m
+# CONFIG_INFINIBAND_EHCA is not set
CONFIG_INFINIBAND_AMSO1100=m
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
CONFIG_INFINIBAND_CXGB3=m
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 3614894d9e..8dacedd4a6 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -2573,7 +2573,7 @@ CONFIG_W1_SLAVE_DS2433_CRC=y
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_APM_POWER=m
diff --git a/config/ppc64/debug b/config/ppc64/debug
index bdeecdd1ff..4f51f2dc83 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -2593,7 +2593,7 @@ CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
# CONFIG_W1_SLAVE_BQ27000 is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_WM831X_BACKUP=m
diff --git a/config/ppc64/default b/config/ppc64/default
index 1405aa17da..700df1c55a 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -2582,7 +2582,7 @@ CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
# CONFIG_W1_SLAVE_BQ27000 is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_WM831X_BACKUP=m
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index 97036ee27c..552dbdcba8 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -2640,7 +2640,7 @@ CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_WM831X_BACKUP=m
diff --git a/config/ppc64/trace b/config/ppc64/trace
index 3bd8e2edc3..c4a75ce523 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -2640,7 +2640,7 @@ CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_WM831X_BACKUP=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index f878cb341c..714ac58b0d 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -2573,7 +2573,7 @@ CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
# CONFIG_W1_SLAVE_BQ27000 is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_PDA_POWER=m
CONFIG_WM831X_BACKUP=m