diff options
| -rw-r--r-- | arch/powerpc/configs/chrp32_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/g5_defconfig | 28 | ||||
| -rw-r--r-- | arch/powerpc/configs/iseries_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc7448_hpc2_defconfig | 28 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc834x_itx_defconfig | 28 | ||||
| -rw-r--r-- | arch/powerpc/configs/pmac32_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 28 | ||||
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 2 |
8 files changed, 60 insertions, 60 deletions
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index bbf2b5f8a8cb..fee72f8a2fb7 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig | |||
| @@ -492,7 +492,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 492 | # CONFIG_MEGARAID_NEWGEN is not set | 492 | # CONFIG_MEGARAID_NEWGEN is not set |
| 493 | # CONFIG_MEGARAID_LEGACY is not set | 493 | # CONFIG_MEGARAID_LEGACY is not set |
| 494 | # CONFIG_MEGARAID_SAS is not set | 494 | # CONFIG_MEGARAID_SAS is not set |
| 495 | # CONFIG_SCSI_SATA is not set | 495 | # CONFIG_ATA is not set |
| 496 | # CONFIG_SCSI_HPTIOP is not set | 496 | # CONFIG_SCSI_HPTIOP is not set |
| 497 | # CONFIG_SCSI_BUSLOGIC is not set | 497 | # CONFIG_SCSI_BUSLOGIC is not set |
| 498 | # CONFIG_SCSI_DMX3191D is not set | 498 | # CONFIG_SCSI_DMX3191D is not set |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 4b9c2ed925f5..92d0a9dd0b8f 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
| @@ -490,23 +490,23 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 490 | # CONFIG_MEGARAID_NEWGEN is not set | 490 | # CONFIG_MEGARAID_NEWGEN is not set |
| 491 | # CONFIG_MEGARAID_LEGACY is not set | 491 | # CONFIG_MEGARAID_LEGACY is not set |
| 492 | # CONFIG_MEGARAID_SAS is not set | 492 | # CONFIG_MEGARAID_SAS is not set |
| 493 | CONFIG_SCSI_SATA=y | 493 | CONFIG_ATA=y |
| 494 | # CONFIG_SCSI_SATA_AHCI is not set | 494 | # CONFIG_SATA_AHCI is not set |
| 495 | CONFIG_SCSI_SATA_SVW=y | 495 | CONFIG_SATA_SVW=y |
| 496 | # CONFIG_SCSI_ATA_PIIX is not set | 496 | # CONFIG_SCSI_ATA_PIIX is not set |
| 497 | # CONFIG_SCSI_SATA_MV is not set | 497 | # CONFIG_SATA_MV is not set |
| 498 | # CONFIG_SCSI_SATA_NV is not set | 498 | # CONFIG_SATA_NV is not set |
| 499 | # CONFIG_SCSI_PDC_ADMA is not set | 499 | # CONFIG_SCSI_PDC_ADMA is not set |
| 500 | # CONFIG_SCSI_HPTIOP is not set | 500 | # CONFIG_SCSI_HPTIOP is not set |
| 501 | # CONFIG_SCSI_SATA_QSTOR is not set | 501 | # CONFIG_SATA_QSTOR is not set |
| 502 | # CONFIG_SCSI_SATA_PROMISE is not set | 502 | # CONFIG_SATA_PROMISE is not set |
| 503 | # CONFIG_SCSI_SATA_SX4 is not set | 503 | # CONFIG_SATA_SX4 is not set |
| 504 | # CONFIG_SCSI_SATA_SIL is not set | 504 | # CONFIG_SATA_SIL is not set |
| 505 | # CONFIG_SCSI_SATA_SIL24 is not set | 505 | # CONFIG_SATA_SIL24 is not set |
| 506 | # CONFIG_SCSI_SATA_SIS is not set | 506 | # CONFIG_SATA_SIS is not set |
| 507 | # CONFIG_SCSI_SATA_ULI is not set | 507 | # CONFIG_SATA_ULI is not set |
| 508 | # CONFIG_SCSI_SATA_VIA is not set | 508 | # CONFIG_SATA_VIA is not set |
| 509 | # CONFIG_SCSI_SATA_VITESSE is not set | 509 | # CONFIG_SATA_VITESSE is not set |
| 510 | # CONFIG_SCSI_BUSLOGIC is not set | 510 | # CONFIG_SCSI_BUSLOGIC is not set |
| 511 | # CONFIG_SCSI_DMX3191D is not set | 511 | # CONFIG_SCSI_DMX3191D is not set |
| 512 | # CONFIG_SCSI_EATA is not set | 512 | # CONFIG_SCSI_EATA is not set |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index eb0885ea0731..d58f82f836f8 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
| @@ -475,7 +475,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 475 | # CONFIG_MEGARAID_NEWGEN is not set | 475 | # CONFIG_MEGARAID_NEWGEN is not set |
| 476 | # CONFIG_MEGARAID_LEGACY is not set | 476 | # CONFIG_MEGARAID_LEGACY is not set |
| 477 | # CONFIG_MEGARAID_SAS is not set | 477 | # CONFIG_MEGARAID_SAS is not set |
| 478 | # CONFIG_SCSI_SATA is not set | 478 | # CONFIG_ATA is not set |
| 479 | # CONFIG_SCSI_HPTIOP is not set | 479 | # CONFIG_SCSI_HPTIOP is not set |
| 480 | # CONFIG_SCSI_BUSLOGIC is not set | 480 | # CONFIG_SCSI_BUSLOGIC is not set |
| 481 | # CONFIG_SCSI_DMX3191D is not set | 481 | # CONFIG_SCSI_DMX3191D is not set |
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 719fba4eb421..d1811e754518 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
| @@ -413,23 +413,23 @@ CONFIG_BLK_DEV_SD=y | |||
| 413 | # CONFIG_MEGARAID_NEWGEN is not set | 413 | # CONFIG_MEGARAID_NEWGEN is not set |
| 414 | # CONFIG_MEGARAID_LEGACY is not set | 414 | # CONFIG_MEGARAID_LEGACY is not set |
| 415 | # CONFIG_MEGARAID_SAS is not set | 415 | # CONFIG_MEGARAID_SAS is not set |
| 416 | CONFIG_SCSI_SATA=y | 416 | CONFIG_ATA=y |
| 417 | # CONFIG_SCSI_SATA_AHCI is not set | 417 | # CONFIG_SATA_AHCI is not set |
| 418 | # CONFIG_SCSI_SATA_SVW is not set | 418 | # CONFIG_SATA_SVW is not set |
| 419 | # CONFIG_SCSI_ATA_PIIX is not set | 419 | # CONFIG_SCSI_ATA_PIIX is not set |
| 420 | CONFIG_SCSI_SATA_MV=y | 420 | CONFIG_SATA_MV=y |
| 421 | # CONFIG_SCSI_SATA_NV is not set | 421 | # CONFIG_SATA_NV is not set |
| 422 | # CONFIG_SCSI_PDC_ADMA is not set | 422 | # CONFIG_SCSI_PDC_ADMA is not set |
| 423 | # CONFIG_SCSI_HPTIOP is not set | 423 | # CONFIG_SCSI_HPTIOP is not set |
| 424 | # CONFIG_SCSI_SATA_QSTOR is not set | 424 | # CONFIG_SATA_QSTOR is not set |
| 425 | # CONFIG_SCSI_SATA_PROMISE is not set | 425 | # CONFIG_SATA_PROMISE is not set |
| 426 | # CONFIG_SCSI_SATA_SX4 is not set | 426 | # CONFIG_SATA_SX4 is not set |
| 427 | # CONFIG_SCSI_SATA_SIL is not set | 427 | # CONFIG_SATA_SIL is not set |
| 428 | # CONFIG_SCSI_SATA_SIL24 is not set | 428 | # CONFIG_SATA_SIL24 is not set |
| 429 | # CONFIG_SCSI_SATA_SIS is not set | 429 | # CONFIG_SATA_SIS is not set |
| 430 | # CONFIG_SCSI_SATA_ULI is not set | 430 | # CONFIG_SATA_ULI is not set |
| 431 | # CONFIG_SCSI_SATA_VIA is not set | 431 | # CONFIG_SATA_VIA is not set |
| 432 | # CONFIG_SCSI_SATA_VITESSE is not set | 432 | # CONFIG_SATA_VITESSE is not set |
| 433 | # CONFIG_SCSI_BUSLOGIC is not set | 433 | # CONFIG_SCSI_BUSLOGIC is not set |
| 434 | # CONFIG_SCSI_DMX3191D is not set | 434 | # CONFIG_SCSI_DMX3191D is not set |
| 435 | # CONFIG_SCSI_EATA is not set | 435 | # CONFIG_SCSI_EATA is not set |
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig index ea55bab759ce..cd3535e1a095 100644 --- a/arch/powerpc/configs/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/mpc834x_itx_defconfig | |||
| @@ -465,23 +465,23 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 465 | # CONFIG_MEGARAID_NEWGEN is not set | 465 | # CONFIG_MEGARAID_NEWGEN is not set |
| 466 | # CONFIG_MEGARAID_LEGACY is not set | 466 | # CONFIG_MEGARAID_LEGACY is not set |
| 467 | # CONFIG_MEGARAID_SAS is not set | 467 | # CONFIG_MEGARAID_SAS is not set |
| 468 | CONFIG_SCSI_SATA=y | 468 | CONFIG_ATA=y |
| 469 | # CONFIG_SCSI_SATA_AHCI is not set | 469 | # CONFIG_SATA_AHCI is not set |
| 470 | # CONFIG_SCSI_SATA_SVW is not set | 470 | # CONFIG_SATA_SVW is not set |
| 471 | # CONFIG_SCSI_ATA_PIIX is not set | 471 | # CONFIG_SCSI_ATA_PIIX is not set |
| 472 | # CONFIG_SCSI_SATA_MV is not set | 472 | # CONFIG_SATA_MV is not set |
| 473 | # CONFIG_SCSI_SATA_NV is not set | 473 | # CONFIG_SATA_NV is not set |
| 474 | # CONFIG_SCSI_PDC_ADMA is not set | 474 | # CONFIG_SCSI_PDC_ADMA is not set |
| 475 | # CONFIG_SCSI_HPTIOP is not set | 475 | # CONFIG_SCSI_HPTIOP is not set |
| 476 | # CONFIG_SCSI_SATA_QSTOR is not set | 476 | # CONFIG_SATA_QSTOR is not set |
| 477 | # CONFIG_SCSI_SATA_PROMISE is not set | 477 | # CONFIG_SATA_PROMISE is not set |
| 478 | # CONFIG_SCSI_SATA_SX4 is not set | 478 | # CONFIG_SATA_SX4 is not set |
| 479 | CONFIG_SCSI_SATA_SIL=y | 479 | CONFIG_SATA_SIL=y |
| 480 | # CONFIG_SCSI_SATA_SIL24 is not set | 480 | # CONFIG_SATA_SIL24 is not set |
| 481 | # CONFIG_SCSI_SATA_SIS is not set | 481 | # CONFIG_SATA_SIS is not set |
| 482 | # CONFIG_SCSI_SATA_ULI is not set | 482 | # CONFIG_SATA_ULI is not set |
| 483 | # CONFIG_SCSI_SATA_VIA is not set | 483 | # CONFIG_SATA_VIA is not set |
| 484 | # CONFIG_SCSI_SATA_VITESSE is not set | 484 | # CONFIG_SATA_VITESSE is not set |
| 485 | # CONFIG_SCSI_BUSLOGIC is not set | 485 | # CONFIG_SCSI_BUSLOGIC is not set |
| 486 | # CONFIG_SCSI_DMX3191D is not set | 486 | # CONFIG_SCSI_DMX3191D is not set |
| 487 | # CONFIG_SCSI_EATA is not set | 487 | # CONFIG_SCSI_EATA is not set |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index dc8df4ef7275..765c8bb90ddd 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
| @@ -682,7 +682,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m | |||
| 682 | # CONFIG_MEGARAID_NEWGEN is not set | 682 | # CONFIG_MEGARAID_NEWGEN is not set |
| 683 | # CONFIG_MEGARAID_LEGACY is not set | 683 | # CONFIG_MEGARAID_LEGACY is not set |
| 684 | # CONFIG_MEGARAID_SAS is not set | 684 | # CONFIG_MEGARAID_SAS is not set |
| 685 | # CONFIG_SCSI_SATA is not set | 685 | # CONFIG_ATA is not set |
| 686 | # CONFIG_SCSI_HPTIOP is not set | 686 | # CONFIG_SCSI_HPTIOP is not set |
| 687 | # CONFIG_SCSI_BUSLOGIC is not set | 687 | # CONFIG_SCSI_BUSLOGIC is not set |
| 688 | # CONFIG_SCSI_DMX3191D is not set | 688 | # CONFIG_SCSI_DMX3191D is not set |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 7517d0c5303f..be11df7c11aa 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -520,23 +520,23 @@ CONFIG_SCSI_ISCSI_ATTRS=m | |||
| 520 | # CONFIG_MEGARAID_NEWGEN is not set | 520 | # CONFIG_MEGARAID_NEWGEN is not set |
| 521 | # CONFIG_MEGARAID_LEGACY is not set | 521 | # CONFIG_MEGARAID_LEGACY is not set |
| 522 | # CONFIG_MEGARAID_SAS is not set | 522 | # CONFIG_MEGARAID_SAS is not set |
| 523 | CONFIG_SCSI_SATA=y | 523 | CONFIG_ATA=y |
| 524 | # CONFIG_SCSI_SATA_AHCI is not set | 524 | # CONFIG_SATA_AHCI is not set |
| 525 | CONFIG_SCSI_SATA_SVW=y | 525 | CONFIG_SATA_SVW=y |
| 526 | # CONFIG_SCSI_ATA_PIIX is not set | 526 | # CONFIG_SCSI_ATA_PIIX is not set |
| 527 | # CONFIG_SCSI_SATA_MV is not set | 527 | # CONFIG_SATA_MV is not set |
| 528 | # CONFIG_SCSI_SATA_NV is not set | 528 | # CONFIG_SATA_NV is not set |
| 529 | # CONFIG_SCSI_PDC_ADMA is not set | 529 | # CONFIG_SCSI_PDC_ADMA is not set |
| 530 | # CONFIG_SCSI_HPTIOP is not set | 530 | # CONFIG_SCSI_HPTIOP is not set |
| 531 | # CONFIG_SCSI_SATA_QSTOR is not set | 531 | # CONFIG_SATA_QSTOR is not set |
| 532 | # CONFIG_SCSI_SATA_PROMISE is not set | 532 | # CONFIG_SATA_PROMISE is not set |
| 533 | # CONFIG_SCSI_SATA_SX4 is not set | 533 | # CONFIG_SATA_SX4 is not set |
| 534 | # CONFIG_SCSI_SATA_SIL is not set | 534 | # CONFIG_SATA_SIL is not set |
| 535 | # CONFIG_SCSI_SATA_SIL24 is not set | 535 | # CONFIG_SATA_SIL24 is not set |
| 536 | # CONFIG_SCSI_SATA_SIS is not set | 536 | # CONFIG_SATA_SIS is not set |
| 537 | # CONFIG_SCSI_SATA_ULI is not set | 537 | # CONFIG_SATA_ULI is not set |
| 538 | # CONFIG_SCSI_SATA_VIA is not set | 538 | # CONFIG_SATA_VIA is not set |
| 539 | # CONFIG_SCSI_SATA_VITESSE is not set | 539 | # CONFIG_SATA_VITESSE is not set |
| 540 | # CONFIG_SCSI_BUSLOGIC is not set | 540 | # CONFIG_SCSI_BUSLOGIC is not set |
| 541 | # CONFIG_SCSI_DMX3191D is not set | 541 | # CONFIG_SCSI_DMX3191D is not set |
| 542 | # CONFIG_SCSI_EATA is not set | 542 | # CONFIG_SCSI_EATA is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index a8cdf312e1b0..44175fb7adec 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -506,7 +506,7 @@ CONFIG_SCSI_SAS_ATTRS=m | |||
| 506 | # CONFIG_MEGARAID_NEWGEN is not set | 506 | # CONFIG_MEGARAID_NEWGEN is not set |
| 507 | # CONFIG_MEGARAID_LEGACY is not set | 507 | # CONFIG_MEGARAID_LEGACY is not set |
| 508 | # CONFIG_MEGARAID_SAS is not set | 508 | # CONFIG_MEGARAID_SAS is not set |
| 509 | # CONFIG_SCSI_SATA is not set | 509 | # CONFIG_ATA is not set |
| 510 | # CONFIG_SCSI_HPTIOP is not set | 510 | # CONFIG_SCSI_HPTIOP is not set |
| 511 | # CONFIG_SCSI_BUSLOGIC is not set | 511 | # CONFIG_SCSI_BUSLOGIC is not set |
| 512 | # CONFIG_SCSI_DMX3191D is not set | 512 | # CONFIG_SCSI_DMX3191D is not set |