Ack: [PATCH Saucy SRU] UBUNTU: [Config] CONFIG_ANDROID=n

[Steve Conklin]

On 10/07/2013 09:07 AM, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/1235161
> 
> Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  .../abi/3.11.0-11.17/amd64/generic.modules         |    2 --
>  .../abi/3.11.0-11.17/armhf/generic-lpae.modules    |    2 --
>  .../abi/3.11.0-11.17/armhf/generic.modules         |    2 --
>  .../abi/3.11.0-11.17/i386/generic.modules          |    2 --
>  debian.master/config/config.common.ubuntu          |   12 +-----------
>  5 files changed, 1 insertion(+), 19 deletions(-)
> 
> diff --git a/debian.master/abi/3.11.0-11.17/amd64/generic.modules b/debian.master/abi/3.11.0-11.17/amd64/generic.modules
> index e921f65..ad5a2a5 100644
> --- a/debian.master/abi/3.11.0-11.17/amd64/generic.modules
> +++ b/debian.master/abi/3.11.0-11.17/amd64/generic.modules
> @@ -1791,7 +1791,6 @@ lms501kf03
>  lnbp21
>  lnbp22
>  lockd
> -logger
>  lp
>  lp3971
>  lp3972
> @@ -3445,7 +3444,6 @@ timb_dma
>  timberdale
>  timblogiw
>  timbuart
> -timed_gpio
>  timeriomem-rng
>  tipc
>  ti_usb_3410_5052
> diff --git a/debian.master/abi/3.11.0-11.17/armhf/generic-lpae.modules b/debian.master/abi/3.11.0-11.17/armhf/generic-lpae.modules
> index 79556c4..c6d1d8b 100644
> --- a/debian.master/abi/3.11.0-11.17/armhf/generic-lpae.modules
> +++ b/debian.master/abi/3.11.0-11.17/armhf/generic-lpae.modules
> @@ -1299,7 +1299,6 @@ lms501kf03
>  lnbp21
>  lnbp22
>  lockd
> -logger
>  lp
>  lp3971
>  lp3972
> @@ -2439,7 +2438,6 @@ ti_dac7512
>  timb_dma
>  timblogiw
>  timbuart
> -timed_gpio
>  timeriomem-rng
>  tipc
>  ti_usb_3410_5052
> diff --git a/debian.master/abi/3.11.0-11.17/armhf/generic.modules b/debian.master/abi/3.11.0-11.17/armhf/generic.modules
> index 275833d..7aaa3e1 100644
> --- a/debian.master/abi/3.11.0-11.17/armhf/generic.modules
> +++ b/debian.master/abi/3.11.0-11.17/armhf/generic.modules
> @@ -1618,7 +1618,6 @@ lms501kf03
>  lnbp21
>  lnbp22
>  lockd
> -logger
>  lp
>  lp3971
>  lp3972
> @@ -3207,7 +3206,6 @@ timb_dma
>  timberdale
>  timblogiw
>  timbuart
> -timed_gpio
>  timeriomem-rng
>  tipc
>  ti-soc-thermal
> diff --git a/debian.master/abi/3.11.0-11.17/i386/generic.modules b/debian.master/abi/3.11.0-11.17/i386/generic.modules
> index cfa674b..10b3bd1 100644
> --- a/debian.master/abi/3.11.0-11.17/i386/generic.modules
> +++ b/debian.master/abi/3.11.0-11.17/i386/generic.modules
> @@ -1858,7 +1858,6 @@ lms501kf03
>  lnbp21
>  lnbp22
>  lockd
> -logger
>  logibm
>  longhaul
>  longrun
> @@ -3632,7 +3631,6 @@ timb_dma
>  timberdale
>  timblogiw
>  timbuart
> -timed_gpio
>  timeriomem-rng
>  tipc
>  ti_usb_3410_5052
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 33afedd..a3c24c1 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -205,13 +205,7 @@ CONFIG_AMD_NUMA=y
>  CONFIG_AMD_PHY=y
>  CONFIG_AMIGA_PARTITION=y
>  CONFIG_AMILO_RFKILL=m
> -CONFIG_ANDROID=y
> -CONFIG_ANDROID_BINDER_IPC=y
> -CONFIG_ANDROID_INTF_ALARM_DEV=y
> -CONFIG_ANDROID_LOGGER=m
> -CONFIG_ANDROID_LOW_MEMORY_KILLER=y
> -CONFIG_ANDROID_TIMED_GPIO=m
> -CONFIG_ANDROID_TIMED_OUTPUT=y
> +# CONFIG_ANDROID is not set
>  CONFIG_ANON_INODES=y
>  CONFIG_APB_TIMER=y
>  CONFIG_APDS9802ALS=m
> @@ -384,7 +378,6 @@ CONFIG_ARM_TIMER_SP804=y
>  CONFIG_ARM_UNWIND=y
>  CONFIG_ARM_VIRT_EXT=y
>  CONFIG_ARPD=y
> -CONFIG_ASHMEM=y
>  CONFIG_ASN1=y
>  CONFIG_ASUS_LAPTOP=m
>  CONFIG_ASUS_NB_WMI=m
> @@ -5964,9 +5957,6 @@ CONFIG_SWAP=y
>  CONFIG_SWIOTLB=y
>  CONFIG_SWIOTLB_XEN=y
>  CONFIG_SWP_EMULATE=y
> -CONFIG_SW_SYNC=y
> -CONFIG_SW_SYNC_USER=y
> -CONFIG_SYNC=y
>  CONFIG_SYNCLINK=m
>  CONFIG_SYNCLINKMP=m
>  CONFIG_SYNCLINK_CS=m
>