diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 10:35:52 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 10:35:52 +1000 |
| commit | 10f52dd9febf0302bc458a6ea7979767dfa9f3b6 (patch) | |
| tree | 9048c0001147e958eb85a138e71237317a70fb54 /arch/powerpc/configs/44x/canyonlands_defconfig | |
| parent | ec3cf2ece22a8ede7478bf38e2a818986322662b (diff) | |
| parent | 336ff735425d2709c4bb3f2a55f7565e8170ce7a (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/configs/44x/canyonlands_defconfig')
| -rw-r--r-- | arch/powerpc/configs/44x/canyonlands_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig index f9a08ee49b9..5e85412eb9f 100644 --- a/arch/powerpc/configs/44x/canyonlands_defconfig +++ b/arch/powerpc/configs/44x/canyonlands_defconfig @@ -262,7 +262,7 @@ CONFIG_PCI_SYSCALL=y # CONFIG_PCIEPORTBUS is not set CONFIG_ARCH_SUPPORTS_MSI=y # CONFIG_PCI_MSI is not set -CONFIG_PCI_LEGACY=y +# CONFIG_PCI_LEGACY is not set # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_STUB is not set # CONFIG_PCCARD is not set @@ -716,7 +716,7 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia drivers # -CONFIG_DAB=y +# CONFIG_DAB is not set # CONFIG_USB_DABUSB is not set # @@ -725,7 +725,7 @@ CONFIG_DAB=y # CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_VIDEO_OUTPUT_CONTROL is not set # CONFIG_FB is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |