diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:36:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:36:43 +0100 |
| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch) | |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /arch/sh/configs/sdk7786_defconfig | |
| parent | x86/softirq/64: Inline do_softirq_own_stack() (diff) | |
| parent | x86/pv: Rework arch_local_irq_restore() to not use popf (diff) | |
| download | linux-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.tar.xz linux-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.zip | |
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.
Conflicts:
arch/x86/xen/xen-asm.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/configs/sdk7786_defconfig')
| -rw-r--r-- | arch/sh/configs/sdk7786_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index 61bec46ebd66..4a44cac640bc 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig @@ -116,9 +116,6 @@ CONFIG_MTD_UBI_GLUEBI=m CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_PLATFORM=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y CONFIG_SCSI_MULTI_LUN=y |