diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-14 15:17:06 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-14 15:17:06 +0000 |
| commit | 64b3b934e786a979b37aebdac43ab58852129ba8 (patch) | |
| tree | b8574ec68a59e73e60338eac0e9f1a95a977f3b3 /strata/bsp-x86_64-generic/linux-x86-64-generic.morph | |
| parent | 45da8d54d7597187ba9f73273230eaa3974f7f1f (diff) | |
| parent | f9e02689f1d9cdaaa1478187f490ca051a607fe4 (diff) | |
| download | definitions-64b3b934e786a979b37aebdac43ab58852129ba8.tar.gz | |
Merge branch 'baserock/richardmaw/pxeboot-write'
Reviewed-by: Jim MacArthur
Reviewed-by: Sam Thursfield
Diffstat (limited to 'strata/bsp-x86_64-generic/linux-x86-64-generic.morph')
| -rw-r--r-- | strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 2 |
1 files changed, 2 insertions, 0 deletions
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 4b18b537..fe0721cc 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -78,6 +78,8 @@ configure-commands: - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI - scripts/config -e HOTPLUG_PCI_ACPI +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make $MAKEFLAGS |