Message ID | 20170206215119.87099-2-code@mmayer.net (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
On 06-02-17, 13:51, Markus Mayer wrote: > From: Markus Mayer <mmayer@broadcom.com> > > Ran "make savedefconfig" to bring bmips_stb_defconfig up to date. > > Signed-off-by: Markus Mayer <mmayer@broadcom.com> > --- > arch/mips/configs/bmips_stb_defconfig | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig > index 4eb5d6e..3be15cb 100644 > --- a/arch/mips/configs/bmips_stb_defconfig > +++ b/arch/mips/configs/bmips_stb_defconfig > @@ -9,7 +9,6 @@ CONFIG_MIPS_O32_FP64_SUPPORT=y > # CONFIG_SWAP is not set > CONFIG_NO_HZ=y > CONFIG_BLK_DEV_INITRD=y > -CONFIG_RD_GZIP=y > CONFIG_EXPERT=y > # CONFIG_VM_EVENT_COUNTERS is not set > # CONFIG_SLUB_DEBUG is not set > @@ -24,7 +23,6 @@ CONFIG_INET=y > # CONFIG_INET_XFRM_MODE_TRANSPORT is not set > # CONFIG_INET_XFRM_MODE_TUNNEL is not set > # CONFIG_INET_XFRM_MODE_BEET is not set > -# CONFIG_INET_LRO is not set > # CONFIG_INET_DIAG is not set > CONFIG_CFG80211=y > CONFIG_NL80211_TESTMODE=y > @@ -34,8 +32,6 @@ CONFIG_DEVTMPFS=y > CONFIG_DEVTMPFS_MOUNT=y > # CONFIG_STANDALONE is not set > # CONFIG_PREVENT_FIRMWARE_BUILD is not set > -CONFIG_PRINTK_TIME=y > -CONFIG_BRCMSTB_GISB_ARB=y > CONFIG_MTD=y > CONFIG_MTD_CFI=y > CONFIG_MTD_CFI_INTELEXT=y > @@ -51,16 +47,15 @@ CONFIG_USB_USBNET=y > # CONFIG_INPUT is not set > # CONFIG_SERIO is not set > # CONFIG_VT is not set > -# CONFIG_DEVKMEM is not set > CONFIG_SERIAL_8250=y > # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set > CONFIG_SERIAL_8250_CONSOLE=y > CONFIG_SERIAL_OF_PLATFORM=y > # CONFIG_HW_RANDOM is not set > -CONFIG_POWER_SUPPLY=y > CONFIG_POWER_RESET=y > CONFIG_POWER_RESET_BRCMSTB=y > CONFIG_POWER_RESET_SYSCON=y > +CONFIG_POWER_SUPPLY=y > # CONFIG_HWMON is not set > CONFIG_USB=y > CONFIG_USB_EHCI_HCD=y > @@ -82,6 +77,7 @@ CONFIG_CIFS=y > CONFIG_NLS_CODEPAGE_437=y > CONFIG_NLS_ASCII=y > CONFIG_NLS_ISO8859_1=y > +CONFIG_PRINTK_TIME=y > CONFIG_DEBUG_FS=y > CONFIG_MAGIC_SYSRQ=y > CONFIG_CMDLINE_BOOL=y This is what happens when people don't update defconfigs properly :) Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig index 4eb5d6e..3be15cb 100644 --- a/arch/mips/configs/bmips_stb_defconfig +++ b/arch/mips/configs/bmips_stb_defconfig @@ -9,7 +9,6 @@ CONFIG_MIPS_O32_FP64_SUPPORT=y # CONFIG_SWAP is not set CONFIG_NO_HZ=y CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_GZIP=y CONFIG_EXPERT=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_SLUB_DEBUG is not set @@ -24,7 +23,6 @@ CONFIG_INET=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y @@ -34,8 +32,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_PRINTK_TIME=y -CONFIG_BRCMSTB_GISB_ARB=y CONFIG_MTD=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y @@ -51,16 +47,15 @@ CONFIG_USB_USBNET=y # CONFIG_INPUT is not set # CONFIG_SERIO is not set # CONFIG_VT is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set -CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_BRCMSTB=y CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set CONFIG_USB=y CONFIG_USB_EHCI_HCD=y @@ -82,6 +77,7 @@ CONFIG_CIFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y +CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_CMDLINE_BOOL=y