tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

m68k: use libata instead of the legacy ide driver

Switch the m68 defconfigs from the deprecated ide subsystem to use libata
instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210616134658.1471835-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe b90257bf 468c736b

+24 -24
+5 -5
arch/m68k/configs/amiga_defconfig
··· 323 323 CONFIG_CDROM_PKTCDVD=m 324 324 CONFIG_ATA_OVER_ETH=m 325 325 CONFIG_DUMMY_IRQ=m 326 - CONFIG_IDE=y 327 - CONFIG_IDE_GD_ATAPI=y 328 - CONFIG_BLK_DEV_IDECD=y 329 - CONFIG_BLK_DEV_GAYLE=y 330 - CONFIG_BLK_DEV_BUDDHA=y 331 326 CONFIG_RAID_ATTRS=m 332 327 CONFIG_SCSI=y 333 328 CONFIG_BLK_DEV_SD=y ··· 339 344 CONFIG_SCSI_A4000T=y 340 345 CONFIG_SCSI_ZORRO7XX=y 341 346 CONFIG_SCSI_ZORRO_ESP=y 347 + CONFIG_ATA=y 348 + # CONFIG_ATA_VERBOSE_ERROR is not set 349 + # CONFIG_ATA_BMDMA is not set 350 + CONFIG_PATA_GAYLE=y 351 + CONFIG_PATA_BUDDHA=y 342 352 CONFIG_MD=y 343 353 CONFIG_MD_LINEAR=m 344 354 CONFIG_BLK_DEV_DM=m
+4 -4
arch/m68k/configs/atari_defconfig
··· 324 324 CONFIG_CDROM_PKTCDVD=m 325 325 CONFIG_ATA_OVER_ETH=m 326 326 CONFIG_DUMMY_IRQ=m 327 - CONFIG_IDE=y 328 - CONFIG_IDE_GD_ATAPI=y 329 - CONFIG_BLK_DEV_IDECD=y 330 - CONFIG_BLK_DEV_FALCON_IDE=y 331 327 CONFIG_RAID_ATTRS=m 332 328 CONFIG_SCSI=y 333 329 CONFIG_BLK_DEV_SD=y ··· 335 339 CONFIG_ISCSI_TCP=m 336 340 CONFIG_ISCSI_BOOT_SYSFS=m 337 341 CONFIG_ATARI_SCSI=y 342 + CONFIG_ATA=y 343 + # CONFIG_ATA_VERBOSE_ERROR is not set 344 + # CONFIG_ATA_BMDMA is not set 345 + CONFIG_PATA_FALCON=y 338 346 CONFIG_MD=y 339 347 CONFIG_MD_LINEAR=m 340 348 CONFIG_BLK_DEV_DM=m
+4 -4
arch/m68k/configs/mac_defconfig
··· 315 315 CONFIG_CDROM_PKTCDVD=m 316 316 CONFIG_ATA_OVER_ETH=m 317 317 CONFIG_DUMMY_IRQ=m 318 - CONFIG_IDE=y 319 - CONFIG_IDE_GD_ATAPI=y 320 - CONFIG_BLK_DEV_IDECD=y 321 - CONFIG_BLK_DEV_PLATFORM=y 322 318 CONFIG_RAID_ATTRS=m 323 319 CONFIG_SCSI=y 324 320 CONFIG_BLK_DEV_SD=y ··· 327 331 CONFIG_ISCSI_BOOT_SYSFS=m 328 332 CONFIG_MAC_SCSI=y 329 333 CONFIG_SCSI_MAC_ESP=y 334 + CONFIG_ATA=y 335 + # CONFIG_ATA_VERBOSE_ERROR is not set 336 + # CONFIG_ATA_BMDMA is not set 337 + CONFIG_PATA_PLATFORM=y 330 338 CONFIG_MD=y 331 339 CONFIG_MD_LINEAR=m 332 340 CONFIG_BLK_DEV_DM=m
+7 -7
arch/m68k/configs/multi_defconfig
··· 344 344 CONFIG_CDROM_PKTCDVD=m 345 345 CONFIG_ATA_OVER_ETH=m 346 346 CONFIG_DUMMY_IRQ=m 347 - CONFIG_IDE=y 348 - CONFIG_IDE_GD_ATAPI=y 349 - CONFIG_BLK_DEV_IDECD=y 350 - CONFIG_BLK_DEV_PLATFORM=y 351 - CONFIG_BLK_DEV_GAYLE=y 352 - CONFIG_BLK_DEV_BUDDHA=y 353 - CONFIG_BLK_DEV_FALCON_IDE=y 354 347 CONFIG_RAID_ATTRS=m 355 348 CONFIG_SCSI=y 356 349 CONFIG_BLK_DEV_SD=y ··· 367 374 CONFIG_MVME16x_SCSI=y 368 375 CONFIG_BVME6000_SCSI=y 369 376 CONFIG_SUN3X_ESP=y 377 + CONFIG_ATA=y 378 + # CONFIG_ATA_VERBOSE_ERROR is not set 379 + # CONFIG_ATA_BMDMA is not set 380 + CONFIG_PATA_FALCON=y 381 + CONFIG_PATA_GAYLE=y 382 + CONFIG_PATA_BUDDHA=y 383 + CONFIG_PATA_PLATFORM=y 370 384 CONFIG_MD=y 371 385 CONFIG_MD_LINEAR=m 372 386 CONFIG_BLK_DEV_DM=m
+4 -4
arch/m68k/configs/q40_defconfig
··· 314 314 CONFIG_CDROM_PKTCDVD=m 315 315 CONFIG_ATA_OVER_ETH=m 316 316 CONFIG_DUMMY_IRQ=m 317 - CONFIG_IDE=y 318 - CONFIG_IDE_GD_ATAPI=y 319 - CONFIG_BLK_DEV_IDECD=y 320 - CONFIG_BLK_DEV_FALCON_IDE=y 321 317 CONFIG_RAID_ATTRS=m 322 318 CONFIG_SCSI=y 323 319 CONFIG_BLK_DEV_SD=y ··· 324 328 CONFIG_SCSI_SAS_ATTRS=m 325 329 CONFIG_ISCSI_TCP=m 326 330 CONFIG_ISCSI_BOOT_SYSFS=m 331 + CONFIG_ATA=y 332 + # CONFIG_ATA_VERBOSE_ERROR is not set 333 + # CONFIG_ATA_BMDMA is not set 334 + CONFIG_PATA_FALCON=y 327 335 CONFIG_MD=y 328 336 CONFIG_MD_LINEAR=m 329 337 CONFIG_BLK_DEV_DM=m