aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mayer <mmayer@broadcom.com>2017-02-07 16:58:53 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-08 19:22:43 -0500
commit71468d748ca0ef647d769a7d990258b47f5d1d6a (patch)
tree2df8e74a592ad88ca66161b50228151a60baa026
parent56c7303e62996fc7b49aea1fd967ccdf94f3a5d9 (diff)
MIPS: BMIPS: Update defconfig
Ran "make savedefconfig" to bring bmips_stb_defconfig up to date. Signed-off-by: Markus Mayer <mmayer@broadcom.com> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/mips/configs/bmips_stb_defconfig8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig
index 4eb5d6e9cf8f..3be15cbbde56 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
9# CONFIG_SWAP is not set 9# CONFIG_SWAP is not set
10CONFIG_NO_HZ=y 10CONFIG_NO_HZ=y
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_RD_GZIP=y
13CONFIG_EXPERT=y 12CONFIG_EXPERT=y
14# CONFIG_VM_EVENT_COUNTERS is not set 13# CONFIG_VM_EVENT_COUNTERS is not set
15# CONFIG_SLUB_DEBUG is not set 14# CONFIG_SLUB_DEBUG is not set
@@ -24,7 +23,6 @@ CONFIG_INET=y
24# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 23# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
25# CONFIG_INET_XFRM_MODE_TUNNEL is not set 24# CONFIG_INET_XFRM_MODE_TUNNEL is not set
26# CONFIG_INET_XFRM_MODE_BEET is not set 25# CONFIG_INET_XFRM_MODE_BEET is not set
27# CONFIG_INET_LRO is not set
28# CONFIG_INET_DIAG is not set 26# CONFIG_INET_DIAG is not set
29CONFIG_CFG80211=y 27CONFIG_CFG80211=y
30CONFIG_NL80211_TESTMODE=y 28CONFIG_NL80211_TESTMODE=y
@@ -34,8 +32,6 @@ CONFIG_DEVTMPFS=y
34CONFIG_DEVTMPFS_MOUNT=y 32CONFIG_DEVTMPFS_MOUNT=y
35# CONFIG_STANDALONE is not set 33# CONFIG_STANDALONE is not set
36# CONFIG_PREVENT_FIRMWARE_BUILD is not set 34# CONFIG_PREVENT_FIRMWARE_BUILD is not set
37CONFIG_PRINTK_TIME=y
38CONFIG_BRCMSTB_GISB_ARB=y
39CONFIG_MTD=y 35CONFIG_MTD=y
40CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_INTELEXT=y 37CONFIG_MTD_CFI_INTELEXT=y
@@ -51,16 +47,15 @@ CONFIG_USB_USBNET=y
51# CONFIG_INPUT is not set 47# CONFIG_INPUT is not set
52# CONFIG_SERIO is not set 48# CONFIG_SERIO is not set
53# CONFIG_VT is not set 49# CONFIG_VT is not set
54# CONFIG_DEVKMEM is not set
55CONFIG_SERIAL_8250=y 50CONFIG_SERIAL_8250=y
56# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set 51# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
57CONFIG_SERIAL_8250_CONSOLE=y 52CONFIG_SERIAL_8250_CONSOLE=y
58CONFIG_SERIAL_OF_PLATFORM=y 53CONFIG_SERIAL_OF_PLATFORM=y
59# CONFIG_HW_RANDOM is not set 54# CONFIG_HW_RANDOM is not set
60CONFIG_POWER_SUPPLY=y
61CONFIG_POWER_RESET=y 55CONFIG_POWER_RESET=y
62CONFIG_POWER_RESET_BRCMSTB=y 56CONFIG_POWER_RESET_BRCMSTB=y
63CONFIG_POWER_RESET_SYSCON=y 57CONFIG_POWER_RESET_SYSCON=y
58CONFIG_POWER_SUPPLY=y
64# CONFIG_HWMON is not set 59# CONFIG_HWMON is not set
65CONFIG_USB=y 60CONFIG_USB=y
66CONFIG_USB_EHCI_HCD=y 61CONFIG_USB_EHCI_HCD=y
@@ -82,6 +77,7 @@ CONFIG_CIFS=y
82CONFIG_NLS_CODEPAGE_437=y 77CONFIG_NLS_CODEPAGE_437=y
83CONFIG_NLS_ASCII=y 78CONFIG_NLS_ASCII=y
84CONFIG_NLS_ISO8859_1=y 79CONFIG_NLS_ISO8859_1=y
80CONFIG_PRINTK_TIME=y
85CONFIG_DEBUG_FS=y 81CONFIG_DEBUG_FS=y
86CONFIG_MAGIC_SYSRQ=y 82CONFIG_MAGIC_SYSRQ=y
87CONFIG_CMDLINE_BOOL=y 83CONFIG_CMDLINE_BOOL=y