Patchwork [Quantal,SRU] UBUNTU: [Config] CONFIG_SATA_AHCI=m

login
register
mail settings
Submitter Tim Gardner
Date Feb. 6, 2013, 7:59 p.m.
Message ID <1360180792-94990-1-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/218728/
State New
Headers show

Comments

Tim Gardner - Feb. 6, 2013, 7:59 p.m.
BugLink: http://bugs.launchpad.net/bugs/1056563

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/config/config.common.ubuntu      |    2 +-
 debian.master/control.d/generic.inclusion-list |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
Brad Figg - Feb. 6, 2013, 8:23 p.m.
On 02/06/2013 11:59 AM, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/1056563
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.master/config/config.common.ubuntu      |    2 +-
>  debian.master/control.d/generic.inclusion-list |    4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 1e13e65..bcc55f5 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -4614,7 +4614,7 @@ CONFIG_S2IO=m
>  CONFIG_SAMSUNG_LAPTOP=m
>  CONFIG_SAMSUNG_Q10=m
>  CONFIG_SATA_ACARD_AHCI=m
> -CONFIG_SATA_AHCI=y
> +CONFIG_SATA_AHCI=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SATA_HIGHBANK=y
>  CONFIG_SATA_INIC162X=m
> diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
> index 49258b8..0478c07 100644
> --- a/debian.master/control.d/generic.inclusion-list
> +++ b/debian.master/control.d/generic.inclusion-list
> @@ -1,6 +1,10 @@
>  arch/*/{crypto,kernel,oprofile}
>  crypto/*
>  drivers/acpi/*
> +drivers/ata/ahci_platform.ko
> +drivers/ata/ahci.ko
> +drivers/ata/acard-ahci.ko
> +drivers/ata/libahci.ko
>  drivers/block/nbd.ko
>  drivers/block/floppy.ko
>  drivers/block/cryptoloop.ko
>
Leann Ogasawara - Feb. 6, 2013, 9:42 p.m.
Ack and applied to quantal master-next.

Thanks,
Leann

On 02/06/2013 11:59 AM, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/1056563
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.master/config/config.common.ubuntu      |    2 +-
>  debian.master/control.d/generic.inclusion-list |    4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 1e13e65..bcc55f5 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -4614,7 +4614,7 @@ CONFIG_S2IO=m
>  CONFIG_SAMSUNG_LAPTOP=m
>  CONFIG_SAMSUNG_Q10=m
>  CONFIG_SATA_ACARD_AHCI=m
> -CONFIG_SATA_AHCI=y
> +CONFIG_SATA_AHCI=m
>  CONFIG_SATA_AHCI_PLATFORM=m
>  CONFIG_SATA_HIGHBANK=y
>  CONFIG_SATA_INIC162X=m
> diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
> index 49258b8..0478c07 100644
> --- a/debian.master/control.d/generic.inclusion-list
> +++ b/debian.master/control.d/generic.inclusion-list
> @@ -1,6 +1,10 @@
>  arch/*/{crypto,kernel,oprofile}
>  crypto/*
>  drivers/acpi/*
> +drivers/ata/ahci_platform.ko
> +drivers/ata/ahci.ko
> +drivers/ata/acard-ahci.ko
> +drivers/ata/libahci.ko
>  drivers/block/nbd.ko
>  drivers/block/floppy.ko
>  drivers/block/cryptoloop.ko

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1e13e65..bcc55f5 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4614,7 +4614,7 @@  CONFIG_S2IO=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_INIC162X=m
diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 49258b8..0478c07 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -1,6 +1,10 @@ 
 arch/*/{crypto,kernel,oprofile}
 crypto/*
 drivers/acpi/*
+drivers/ata/ahci_platform.ko
+drivers/ata/ahci.ko
+drivers/ata/acard-ahci.ko
+drivers/ata/libahci.ko
 drivers/block/nbd.ko
 drivers/block/floppy.ko
 drivers/block/cryptoloop.ko