Message ID | 1398437439-8112-2-git-send-email-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show |
On 04/25/2014 07:50 AM, Tim Gardner wrote: > BugLink: http://bugs.launchpad.net/bugs/1312783 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 - > debian.master/config/config.common.ubuntu | 2 ++ > debian.master/config/i386/config.common.i386 | 1 - > debian.master/config/powerpc/config.common.powerpc | 1 - > debian.master/config/ppc64el/config.common.ppc64el | 5 ++--- > 5 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 2828cff..6c219cb 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -147,7 +147,6 @@ CONFIG_REED_SOLOMON=m > CONFIG_REGULATOR_FIXED_VOLTAGE=m > # CONFIG_REGULATOR_S2MPS11 is not set > CONFIG_REISERFS_FS=m > -CONFIG_RELOCATABLE=y > CONFIG_RFKILL=y > CONFIG_RT2800USB_UNKNOWN=y > # CONFIG_RT2X00_LIB_DEBUGFS is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index ef5d95d..d0251ca 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1964,6 +1964,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437 > CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" > CONFIG_FAT_FS=y > # CONFIG_FAULT_INJECTION is not set > +# CONFIG_FA_DUMP is not set > CONFIG_FB=y > CONFIG_FB_3DFX=m > CONFIG_FB_3DFX_ACCEL=y > @@ -5252,6 +5253,7 @@ CONFIG_REISERFS_FS_SECURITY=y > CONFIG_REISERFS_FS_XATTR=y > # CONFIG_REISERFS_PROC_INFO is not set > CONFIG_RELAY=y > +CONFIG_RELOCATABLE=y > CONFIG_REMOTEPROC=m > CONFIG_RESET_CONTROLLER=y > CONFIG_RESOURCE_COUNTERS=y > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index 3815022..e3b81aa 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -144,7 +144,6 @@ CONFIG_REED_SOLOMON=m > CONFIG_REGULATOR_FIXED_VOLTAGE=m > # CONFIG_REGULATOR_S2MPS11 is not set > CONFIG_REISERFS_FS=m > -CONFIG_RELOCATABLE=y > CONFIG_RFKILL=y > CONFIG_RT2800USB_UNKNOWN=y > # CONFIG_RT2X00_LIB_DEBUGFS is not set > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 5a2a977..b6b959b 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -166,7 +166,6 @@ CONFIG_REED_SOLOMON=m > CONFIG_REGULATOR_FIXED_VOLTAGE=m > CONFIG_REGULATOR_S2MPS11=m > CONFIG_REISERFS_FS=m > -CONFIG_RELOCATABLE=y > CONFIG_RFKILL=y > CONFIG_RT2800USB_UNKNOWN=y > # CONFIG_RT2X00_LIB_DEBUGFS is not set > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index c97922b..92159cc 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -23,7 +23,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y > # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set > CONFIG_CPU_IDLE=y > CONFIG_CPU_LITTLE_ENDIAN=y > -# CONFIG_CRASH_DUMP is not set > +CONFIG_CRASH_DUMP=y > CONFIG_CRYPTO_DEV_NX_COMPRESS=y > CONFIG_DEBUG_MEMORY_INIT=y > CONFIG_DEFAULT_CFQ=y > @@ -124,7 +124,7 @@ CONFIG_NEED_DMA_MAP_STATE=y > CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y > # CONFIG_NET_TULIP is not set > CONFIG_NODES_SHIFT=8 > -# CONFIG_NONSTATIC_KERNEL is not set > +CONFIG_NONSTATIC_KERNEL=y > CONFIG_NOP_USB_XCEIV=m > # CONFIG_NO_HZ_FULL is not set > CONFIG_NO_HZ_IDLE=y > @@ -205,7 +205,6 @@ CONFIG_REED_SOLOMON=m > CONFIG_REGULATOR_FIXED_VOLTAGE=m > # CONFIG_REGULATOR_S2MPS11 is not set > CONFIG_REISERFS_FS=y > -# CONFIG_RELOCATABLE is not set > # CONFIG_RFKILL is not set > CONFIG_RT2800USB_UNKNOWN=y > CONFIG_RT2X00_LIB_DEBUGFS=y >
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 2828cff..6c219cb 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -147,7 +147,6 @@ CONFIG_REED_SOLOMON=m CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_S2MPS11 is not set CONFIG_REISERFS_FS=m -CONFIG_RELOCATABLE=y CONFIG_RFKILL=y CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ef5d95d..d0251ca 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1964,6 +1964,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_FAT_FS=y # CONFIG_FAULT_INJECTION is not set +# CONFIG_FA_DUMP is not set CONFIG_FB=y CONFIG_FB_3DFX=m CONFIG_FB_3DFX_ACCEL=y @@ -5252,6 +5253,7 @@ CONFIG_REISERFS_FS_SECURITY=y CONFIG_REISERFS_FS_XATTR=y # CONFIG_REISERFS_PROC_INFO is not set CONFIG_RELAY=y +CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RESET_CONTROLLER=y CONFIG_RESOURCE_COUNTERS=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 3815022..e3b81aa 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -144,7 +144,6 @@ CONFIG_REED_SOLOMON=m CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_S2MPS11 is not set CONFIG_REISERFS_FS=m -CONFIG_RELOCATABLE=y CONFIG_RFKILL=y CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 5a2a977..b6b959b 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -166,7 +166,6 @@ CONFIG_REED_SOLOMON=m CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REISERFS_FS=m -CONFIG_RELOCATABLE=y CONFIG_RFKILL=y CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index c97922b..92159cc 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -23,7 +23,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set CONFIG_CPU_IDLE=y CONFIG_CPU_LITTLE_ENDIAN=y -# CONFIG_CRASH_DUMP is not set +CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_DEV_NX_COMPRESS=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEFAULT_CFQ=y @@ -124,7 +124,7 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y # CONFIG_NET_TULIP is not set CONFIG_NODES_SHIFT=8 -# CONFIG_NONSTATIC_KERNEL is not set +CONFIG_NONSTATIC_KERNEL=y CONFIG_NOP_USB_XCEIV=m # CONFIG_NO_HZ_FULL is not set CONFIG_NO_HZ_IDLE=y @@ -205,7 +205,6 @@ CONFIG_REED_SOLOMON=m CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_S2MPS11 is not set CONFIG_REISERFS_FS=y -# CONFIG_RELOCATABLE is not set # CONFIG_RFKILL is not set CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2X00_LIB_DEBUGFS=y
BugLink: http://bugs.launchpad.net/bugs/1312783 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/config.common.ubuntu | 2 ++ debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/ppc64el/config.common.ppc64el | 5 ++--- 5 files changed, 4 insertions(+), 6 deletions(-)