diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-06-18 07:29:25 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2012-06-19 00:03:28 -0700 |
| commit | 4e3694272581b652cd89de414c8029b0b138c085 (patch) | |
| tree | d8f68fe527e5111372582f9bafd40eb72a7c5feb | |
| parent | 27402179b61c08763678727ef808dc5eb1ed3430 (diff) | |
UBUNTU: [Config] Updateconfigs after rebase to v3.5-rc3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bd166adf281..af97bcca297 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3941,6 +3941,8 @@ CONFIG_PANEL_PROFILE=5 CONFIG_PANEL_SHARP_LS037V7DW01=y CONFIG_PANEL_TFP410=m CONFIG_PANEL_TPO_TD043MTEA1=y +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y @@ -5410,7 +5412,7 @@ CONFIG_STE10XP=y # CONFIG_STMMAC_DA is not set # CONFIG_STMMAC_DEBUG_FS is not set # CONFIG_STMMAC_PCI is not set -CONFIG_STMMAC_PLATFORM=m +CONFIG_STMMAC_PLATFORM=y CONFIG_STMMAC_RING=y CONFIG_STMPE_I2C=y CONFIG_STMPE_SPI=y |