diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 11:18:34 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 11:18:34 -0500 |
| commit | 975b89399679dcf8587288d46d3f21d4286af167 (patch) | |
| tree | 5e634b6d99313865fb47e9f6f3408d25b47f1098 /arch/powerpc/configs/ppc64_defconfig | |
| parent | 578f8f20f3c7e2c18083cf3bd434df994280af30 (diff) | |
| parent | fc7900bb04c4290f3a8e43abf231aee566feff6d (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index debac66e8258..a8da0aea3b87 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 500 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 500 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 501 | # CONFIG_BLK_DEV_SVWKS is not set | 501 | # CONFIG_BLK_DEV_SVWKS is not set |
| 502 | # CONFIG_BLK_DEV_SIIMAGE is not set | 502 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 503 | CONFIG_BLK_DEV_SL82C105=y | 503 | # CONFIG_BLK_DEV_SL82C105 is not set |
| 504 | # CONFIG_BLK_DEV_SLC90E66 is not set | 504 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 505 | # CONFIG_BLK_DEV_TRM290 is not set | 505 | # CONFIG_BLK_DEV_TRM290 is not set |
| 506 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 506 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y | |||
| 646 | # CONFIG_PATA_SIL680 is not set | 646 | # CONFIG_PATA_SIL680 is not set |
| 647 | # CONFIG_PATA_SIS is not set | 647 | # CONFIG_PATA_SIS is not set |
| 648 | # CONFIG_PATA_VIA is not set | 648 | # CONFIG_PATA_VIA is not set |
| 649 | # CONFIG_PATA_WINBOND is not set | 649 | CONFIG_PATA_WINBOND=y |
| 650 | 650 | ||
| 651 | # | 651 | # |
| 652 | # Multi-device support (RAID and LVM) | 652 | # Multi-device support (RAID and LVM) |