diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-19 15:43:11 +0100 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-19 15:43:11 +0100 |
commit | 54d05201b888bc2f0b27615a7bb1d457d0d6d574 (patch) | |
tree | 23074235f223ad0167fed98d72b00e150148ade1 /strata | |
parent | 0c68f1677e9974b2ba95aa09223db6372fb05515 (diff) | |
parent | e37ba375ff985baacc9c22024412dfeb60ed55ee (diff) | |
download | definitions-54d05201b888bc2f0b27615a7bb1d457d0d6d574.tar.gz |
Merge branch 'baserock/pedroalvarez/enable-hotplug'
Reviewed-by: Sam Thursfield
Reviewed-by: Richard Maw
Diffstat (limited to 'strata')
-rw-r--r-- | strata/bsp-x86_32-generic/linux-x86-32-generic.morph | 2 | ||||
-rw-r--r-- | strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph index af773c78..10bac0cd 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -76,6 +76,8 @@ configure-commands: - scripts/config -e NF_NAT_IPV4 - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA +- scripts/config -e HOTPLUG_PCI +- scripts/config -e HOTPLUG_PCI_ACPI - yes '' | make oldconfig build-commands: - make $MAKEFLAGS diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index 6d95bddf..4b18b537 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -76,6 +76,8 @@ configure-commands: - scripts/config -e NF_NAT_IPV4 - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA +- scripts/config -e HOTPLUG_PCI +- scripts/config -e HOTPLUG_PCI_ACPI - yes '' | make oldconfig build-commands: - make $MAKEFLAGS |