diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-04-24 09:22:16 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-24 09:22:55 +0300 |
| commit | 36dbae9945322e660795e73ffc8ed8ae4f25d13d (patch) | |
| tree | 9e444e68380061dccfaa453d1f02cf21c5c986ef /arch/mips/configs/lasat_defconfig | |
| parent | 14ff6c5546e7d98f8326d9ee7a75b79de9874efb (diff) | |
| parent | 0d283287a42027e8a618bcdf17b79578041ebabd (diff) | |
| download | linux-36dbae9945322e660795e73ffc8ed8ae4f25d13d.tar.xz | |
Merge branch 'topic/nhlt' into for-next
Merge NHLT init cleanup.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/mips/configs/lasat_defconfig')
| -rw-r--r-- | arch/mips/configs/lasat_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig index c66ca3785655..00cf461db971 100644 --- a/arch/mips/configs/lasat_defconfig +++ b/arch/mips/configs/lasat_defconfig @@ -16,8 +16,6 @@ CONFIG_HZ_1000=y # CONFIG_SECCOMP is not set CONFIG_PCI=y # CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y |