[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.28-6.16/modules.ignore |    1 +
 debian/config/amd64/config            |    4 ++--
 debian/config/i386/config             |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 debian/abi/2.6.28-6.16/modules.ignore

diff --git a/debian/abi/2.6.28-6.16/modules.ignore b/debian/abi/2.6.28-6.16/modules.ignore
new file mode 100644
index 0000000..39e66d9
--- /dev/null
+++ b/debian/abi/2.6.28-6.16/modules.ignore
@@ -0,0 +1 @@
+tlsup
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 6ff2918..3142b66 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -49,7 +49,7 @@ CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_WMI=y
 CONFIG_ACQUIRE_WDT=m
@@ -3085,7 +3085,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 028de06..d492362 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -52,7 +52,7 @@ CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_WMI=y
 CONFIG_ACQUIRE_WDT=m
@@ -3318,7 +3318,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.1.2.419.g0d87e