diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-17 16:17:58 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-17 16:17:58 +1100 |
| commit | 52920df4aa9dd25836b8ed4dc0b177ea14c09e53 (patch) | |
| tree | 47b3fab4849f7faeaaf88e2ca8dcc911a0c39103 /arch/powerpc/configs | |
| parent | 0173d422aa32fa1e5141f1759202b955215c1da2 (diff) | |
| parent | 9cd55be4d22376893d2818ce3c0e5706a3d74121 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25
Diffstat (limited to 'arch/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/pasemi_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 9d21b083ae1..797f0dfebde 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24-rc6 -# Fri Dec 28 11:01:53 2007 +# Tue Jan 15 10:26:10 2008 # CONFIG_PPC64=y @@ -152,7 +152,6 @@ CONFIG_PPC_PASEMI=y CONFIG_PPC_PASEMI_IOMMU=y # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set CONFIG_PPC_PASEMI_MDIO=y -CONFIG_ELECTRA_IDE=y # CONFIG_PPC_CELLEB is not set # CONFIG_PPC_PS3 is not set # CONFIG_PPC_CELL is not set @@ -663,6 +662,7 @@ CONFIG_PATA_PCMCIA=y # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set CONFIG_PATA_PLATFORM=y +CONFIG_PATA_OF_PLATFORM=y CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=y |