| Message ID | 1349189798-10013-2-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
Applied to Quantal
On 10/02/2012 05:31 PM, Tim Gardner wrote: > Applied to Quantal > Sorry, i forgot to say it was for P too.
Ack for P.
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index d2bc0a1..2dc323b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -334,6 +334,7 @@ CONFIG_TCG_TIS=m CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y +# CONFIG_TIDSPBRIDGE is not set CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TPS65010=m CONFIG_TRANZPORT=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 6bb8860..3a0c5b1 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -315,6 +315,7 @@ CONFIG_TASKSTATS=y # CONFIG_TCG_TPM is not set CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y +CONFIG_TIDSPBRIDGE=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TPS65010=m CONFIG_TRANZPORT=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 41e022d..8cf8e0a 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -108,6 +108,7 @@ CONFIG_STE10XP=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_TABLET_USB_WACOM=m # CONFIG_TCG_TPM is not set +CONFIG_TIDSPBRIDGE=m CONFIG_TPS65010=m CONFIG_TRANZPORT=m CONFIG_TWL4030_CORE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 9373db3..67d87fa 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5193,7 +5193,13 @@ CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THRUSTMASTER_FF=y # CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_ONESHOT=y -# CONFIG_TIDSPBRIDGE is not set +# CONFIG_TIDSPBRIDGE_BACKTRACE is not set +# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set +# CONFIG_TIDSPBRIDGE_DEBUG is not set +CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 +# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set +CONFIG_TIDSPBRIDGE_RECOVERY=y +# CONFIG_TIDSPBRIDGE_WDT3 is not set CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 89aa1d8..9bda481 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -330,6 +330,7 @@ CONFIG_TCG_TIS=m CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y +# CONFIG_TIDSPBRIDGE is not set CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TPS65010=m CONFIG_TRANZPORT=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index fe71e97..4e2a857 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -321,6 +321,7 @@ CONFIG_TASKSTATS=y CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y +# CONFIG_TIDSPBRIDGE is not set CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m # CONFIG_TPS65010 is not set # CONFIG_TRANZPORT is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index ef04963..670faa7 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -354,6 +354,7 @@ CONFIG_TASKSTATS=y CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y +# CONFIG_TIDSPBRIDGE is not set CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m # CONFIG_TPS65010 is not set # CONFIG_TRANZPORT is not set
BugLink: http://bugs.launchpad.net/bugs/1058022 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 8 +++++++- debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 7 files changed, 13 insertions(+), 1 deletion(-)