diff options
author | Markus Mayer <mmayer@broadcom.com> | 2017-02-07 16:58:53 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-08 19:22:43 -0500 |
commit | 71468d748ca0ef647d769a7d990258b47f5d1d6a (patch) | |
tree | 2df8e74a592ad88ca66161b50228151a60baa026 | |
parent | 56c7303e62996fc7b49aea1fd967ccdf94f3a5d9 (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_defconfig | 8 |
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 |
10 | CONFIG_NO_HZ=y | 10 | CONFIG_NO_HZ=y |
11 | CONFIG_BLK_DEV_INITRD=y | 11 | CONFIG_BLK_DEV_INITRD=y |
12 | CONFIG_RD_GZIP=y | ||
13 | CONFIG_EXPERT=y | 12 | CONFIG_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 |
29 | CONFIG_CFG80211=y | 27 | CONFIG_CFG80211=y |
30 | CONFIG_NL80211_TESTMODE=y | 28 | CONFIG_NL80211_TESTMODE=y |
@@ -34,8 +32,6 @@ CONFIG_DEVTMPFS=y | |||
34 | CONFIG_DEVTMPFS_MOUNT=y | 32 | CONFIG_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 |
37 | CONFIG_PRINTK_TIME=y | ||
38 | CONFIG_BRCMSTB_GISB_ARB=y | ||
39 | CONFIG_MTD=y | 35 | CONFIG_MTD=y |
40 | CONFIG_MTD_CFI=y | 36 | CONFIG_MTD_CFI=y |
41 | CONFIG_MTD_CFI_INTELEXT=y | 37 | CONFIG_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 | ||
55 | CONFIG_SERIAL_8250=y | 50 | CONFIG_SERIAL_8250=y |
56 | # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set | 51 | # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set |
57 | CONFIG_SERIAL_8250_CONSOLE=y | 52 | CONFIG_SERIAL_8250_CONSOLE=y |
58 | CONFIG_SERIAL_OF_PLATFORM=y | 53 | CONFIG_SERIAL_OF_PLATFORM=y |
59 | # CONFIG_HW_RANDOM is not set | 54 | # CONFIG_HW_RANDOM is not set |
60 | CONFIG_POWER_SUPPLY=y | ||
61 | CONFIG_POWER_RESET=y | 55 | CONFIG_POWER_RESET=y |
62 | CONFIG_POWER_RESET_BRCMSTB=y | 56 | CONFIG_POWER_RESET_BRCMSTB=y |
63 | CONFIG_POWER_RESET_SYSCON=y | 57 | CONFIG_POWER_RESET_SYSCON=y |
58 | CONFIG_POWER_SUPPLY=y | ||
64 | # CONFIG_HWMON is not set | 59 | # CONFIG_HWMON is not set |
65 | CONFIG_USB=y | 60 | CONFIG_USB=y |
66 | CONFIG_USB_EHCI_HCD=y | 61 | CONFIG_USB_EHCI_HCD=y |
@@ -82,6 +77,7 @@ CONFIG_CIFS=y | |||
82 | CONFIG_NLS_CODEPAGE_437=y | 77 | CONFIG_NLS_CODEPAGE_437=y |
83 | CONFIG_NLS_ASCII=y | 78 | CONFIG_NLS_ASCII=y |
84 | CONFIG_NLS_ISO8859_1=y | 79 | CONFIG_NLS_ISO8859_1=y |
80 | CONFIG_PRINTK_TIME=y | ||
85 | CONFIG_DEBUG_FS=y | 81 | CONFIG_DEBUG_FS=y |
86 | CONFIG_MAGIC_SYSRQ=y | 82 | CONFIG_MAGIC_SYSRQ=y |
87 | CONFIG_CMDLINE_BOOL=y | 83 | CONFIG_CMDLINE_BOOL=y |