diff options
| author |   Dave Airlie <airlied@redhat.com> | 2021-01-25 14:35:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-01-25 14:35:44 +1000 |
| commit | bc96ad6722f86a377ed2872c9a4854c90caf78ca (patch) | |
| tree | ece8859165a1faa10e4e2203d231fc7e87925139 /arch/sh/configs/landisk_defconfig | |
| parent | Merge tag 'drm-intel-gt-next-2021-01-21-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| parent | Linux 5.11-rc5 (diff) | |
| download | linux-dev-bc96ad6722f86a377ed2872c9a4854c90caf78ca.tar.xz linux-dev-bc96ad6722f86a377ed2872c9a4854c90caf78ca.zip | |
Merge tag 'v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge v5.11-rc5 into drm-next to clean up a bunch of conflicts we are dragging around.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/sh/configs/landisk_defconfig')
| -rw-r--r-- | arch/sh/configs/landisk_defconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig index ba6ec042606f..e6c5ddf070c0 100644 --- a/arch/sh/configs/landisk_defconfig +++ b/arch/sh/configs/landisk_defconfig @@ -27,13 +27,12 @@ CONFIG_NETFILTER=y CONFIG_ATALK=m CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_OFFBOARD=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_AEC62XX=y +CONFIG_ATA=y +CONFIG_ATA_GENERIC=y +CONFIG_PATA_ATP867X=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SR=y CONFIG_SCSI_MULTI_LUN=y CONFIG_MD=y CONFIG_BLK_DEV_MD=m |