Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2009-07-28 12:23:26 +0200
committerMichal Marek <mmarek@suse.cz>2009-07-28 12:23:26 +0200
commit968867a3e08ff1aad927929963fa4529941da5a9 (patch)
treed395dc3aeb54a1678c6d49dd6e1f3db3bb326331
parent313f1e2be7e6dc7c24cfc2673e47721b88eed366 (diff)
- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
-rw-r--r--config/ia64/debug2
-rw-r--r--config/ia64/default2
-rw-r--r--config/ia64/trace2
-rw-r--r--config/ia64/vanilla2
-rw-r--r--config/ppc/default2
-rw-r--r--config/ppc/kdump2
-rw-r--r--config/ppc/ppc642
-rw-r--r--config/ppc/vanilla2
-rw-r--r--config/ppc64/debug2
-rw-r--r--config/ppc64/default2
-rw-r--r--config/ppc64/kdump2
-rw-r--r--config/ppc64/ppc642
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--kernel-source.changes5
14 files changed, 18 insertions, 13 deletions
diff --git a/config/ia64/debug b/config/ia64/debug
index 95d85d9994..d20704a140 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -3451,7 +3451,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ia64/default b/config/ia64/default
index 1efcf2b235..6ca33afd60 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -3432,7 +3432,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ia64/trace b/config/ia64/trace
index 0d49f670f0..fb63a4570b 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -3439,7 +3439,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index 93f69e3877..9689d77e16 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -3416,7 +3416,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc/default b/config/ppc/default
index 11420c36c6..0a42b01d0a 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -3264,7 +3264,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc/kdump b/config/ppc/kdump
index 694c010eba..2ca0496de2 100644
--- a/config/ppc/kdump
+++ b/config/ppc/kdump
@@ -2363,7 +2363,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index c9c0a05126..cbdb0f67d9 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -3206,7 +3206,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 6fde653c80..32f9fd5453 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -3245,7 +3245,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc64/debug b/config/ppc64/debug
index c98780d3f4..03f8936359 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -3112,7 +3112,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc64/default b/config/ppc64/default
index bb440e4748..39dc7b888f 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -3101,7 +3101,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc64/kdump b/config/ppc64/kdump
index e6584cab03..faa9f7d8a6 100644
--- a/config/ppc64/kdump
+++ b/config/ppc64/kdump
@@ -2363,7 +2363,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index 51ebdde9be..fb292a35a3 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -3206,7 +3206,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 93aa1efb48..8322a9f845 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -3082,7 +3082,7 @@ CONFIG_USB_IP_COMMON=m
CONFIG_USB_IP_VHCI_HCD=m
CONFIG_USB_IP_HOST=m
CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_PRISM2_USB is not set
CONFIG_ECHO=m
CONFIG_USB_ATMEL=m
CONFIG_POCH=m
diff --git a/kernel-source.changes b/kernel-source.changes
index 2a161ad177..f138364406 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
+
+- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
+
+-------------------------------------------------------------------
Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
- Update config files: disable CONFIG_FB_UDL on ia64.