diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-11 20:35:52 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-11 20:35:52 -0400 |
| commit | 10f52dd9febf0302bc458a6ea7979767dfa9f3b6 (patch) | |
| tree | 9048c0001147e958eb85a138e71237317a70fb54 /arch/powerpc/configs/44x/sam440ep_defconfig | |
| parent | ec3cf2ece22a8ede7478bf38e2a818986322662b (diff) | |
| parent | 336ff735425d2709c4bb3f2a55f7565e8170ce7a (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/configs/44x/sam440ep_defconfig')
| -rw-r--r-- | arch/powerpc/configs/44x/sam440ep_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig index 70d5c3fa3283..e14e89a5e06b 100644 --- a/arch/powerpc/configs/44x/sam440ep_defconfig +++ b/arch/powerpc/configs/44x/sam440ep_defconfig | |||
| @@ -262,7 +262,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 262 | # CONFIG_PCIEPORTBUS is not set | 262 | # CONFIG_PCIEPORTBUS is not set |
| 263 | CONFIG_ARCH_SUPPORTS_MSI=y | 263 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 264 | # CONFIG_PCI_MSI is not set | 264 | # CONFIG_PCI_MSI is not set |
| 265 | CONFIG_PCI_LEGACY=y | 265 | # CONFIG_PCI_LEGACY is not set |
| 266 | # CONFIG_PCI_STUB is not set | 266 | # CONFIG_PCI_STUB is not set |
| 267 | # CONFIG_PCCARD is not set | 267 | # CONFIG_PCCARD is not set |
| 268 | # CONFIG_HOTPLUG_PCI is not set | 268 | # CONFIG_HOTPLUG_PCI is not set |