diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 02:59:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 02:59:10 -0400 |
| commit | cc4949e1fdade5d063e9f8783cf0e2cc92041ce5 (patch) | |
| tree | 4023bd641bfe464efbde518fb504d6865c9df014 /arch/powerpc/configs/40x/virtex_defconfig | |
| parent | 28b4868820a56de661f54742ff91b78e12f1e582 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest to fix a bug in it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/configs/40x/virtex_defconfig')
| -rw-r--r-- | arch/powerpc/configs/40x/virtex_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig index f5698f962e58..416e79ac0711 100644 --- a/arch/powerpc/configs/40x/virtex_defconfig +++ b/arch/powerpc/configs/40x/virtex_defconfig | |||
| @@ -258,7 +258,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 258 | # CONFIG_PCIEPORTBUS is not set | 258 | # CONFIG_PCIEPORTBUS is not set |
| 259 | CONFIG_ARCH_SUPPORTS_MSI=y | 259 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 260 | # CONFIG_PCI_MSI is not set | 260 | # CONFIG_PCI_MSI is not set |
| 261 | CONFIG_PCI_LEGACY=y | 261 | # CONFIG_PCI_LEGACY is not set |
| 262 | # CONFIG_PCI_DEBUG is not set | 262 | # CONFIG_PCI_DEBUG is not set |
| 263 | # CONFIG_PCI_STUB is not set | 263 | # CONFIG_PCI_STUB is not set |
| 264 | # CONFIG_PCCARD is not set | 264 | # CONFIG_PCCARD is not set |