[PATCH 3/3] UBUNTU: move toshiba laptops back from tlsup to toshiba_acpi

[Andy Whitcroft]

Bug: #269831

When Intrepid released we switched Toshiba laptops to using tlsup.  This
is not compatible with the X input model so switch back to toshiba_acpi.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian/abi/2.6.27-8.17/amd64/generic.modules |    2 +-
 debian/abi/2.6.27-8.17/amd64/server.modules  |    2 +-
 debian/abi/2.6.27-8.17/i386/generic.modules  |    2 +-
 debian/abi/2.6.27-8.17/i386/server.modules   |    2 +-
 debian/config/amd64/config                   |    4 ++--
 debian/config/i386/config                    |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/abi/2.6.27-8.17/amd64/generic.modules b/debian/abi/2.6.27-8.17/amd64/generic.modules
index de79e42..1c44dff 100644
--- a/debian/abi/2.6.27-8.17/amd64/generic.modules
+++ b/debian/abi/2.6.27-8.17/amd64/generic.modules
@@ -1802,11 +1802,11 @@ tlan
 tlclk
 tle62x0
 tlsf
-tlsup
 tmdc
 tms380tr
 tmscsim
 tmspci
+toshiba_acpi
 touchit213
 touchright
 touchwin
diff --git a/debian/abi/2.6.27-8.17/amd64/server.modules b/debian/abi/2.6.27-8.17/amd64/server.modules
index de79e42..1c44dff 100644
--- a/debian/abi/2.6.27-8.17/amd64/server.modules
+++ b/debian/abi/2.6.27-8.17/amd64/server.modules
@@ -1802,11 +1802,11 @@ tlan
 tlclk
 tle62x0
 tlsf
-tlsup
 tmdc
 tms380tr
 tmscsim
 tmspci
+toshiba_acpi
 touchit213
 touchright
 touchwin
diff --git a/debian/abi/2.6.27-8.17/i386/generic.modules b/debian/abi/2.6.27-8.17/i386/generic.modules
index a77dbdb..0b91247 100644
--- a/debian/abi/2.6.27-8.17/i386/generic.modules
+++ b/debian/abi/2.6.27-8.17/i386/generic.modules
@@ -2013,11 +2013,11 @@ tlan
 tlclk
 tle62x0
 tlsf
-tlsup
 tmdc
 tms380tr
 tmscsim
 tmspci
+toshiba_acpi
 touchit213
 touchright
 touchwin
diff --git a/debian/abi/2.6.27-8.17/i386/server.modules b/debian/abi/2.6.27-8.17/i386/server.modules
index f5c5847..bbb7044 100644
--- a/debian/abi/2.6.27-8.17/i386/server.modules
+++ b/debian/abi/2.6.27-8.17/i386/server.modules
@@ -2011,11 +2011,11 @@ tlan
 tlclk
 tle62x0
 tlsf
-tlsup
 tmdc
 tms380tr
 tmscsim
 tmspci
+toshiba_acpi
 touchit213
 touchright
 touchwin
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 3210308..862d516 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -53,7 +53,7 @@ CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_WMI=m
 CONFIG_ACQUIRE_WDT=m
@@ -2927,7 +2927,7 @@ CONFIG_TLAN=m
 CONFIG_TLSF=m
 # CONFIG_TLSF_DEBUG is not set
 # CONFIG_TLSF_STATS is not set
-CONFIG_TLSUP=m
+# CONFIG_TLSUP is not set
 CONFIG_TMD_HERMES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index d49ba4a..c88afea 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -55,7 +55,7 @@ CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_WMI=m
 CONFIG_ACQUIRE_WDT=m
@@ -3158,7 +3158,7 @@ CONFIG_TLAN=m
 CONFIG_TLSF=m
 # CONFIG_TLSF_DEBUG is not set
 # CONFIG_TLSF_STATS is not set
-CONFIG_TLSUP=m
+# CONFIG_TLSUP is not set
 CONFIG_TMD_HERMES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-- 
1.6.0.4.911.gc990