diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:48:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:48:03 -0400 |
| commit | 14d1adfc59ba66932ef167fdff62983e7c2b0197 (patch) | |
| tree | 34bad21bf4ec220be87fa5d79ff41dd98e7dad9f /arch/powerpc/configs/maple_defconfig | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
| parent | 69917c26c840e7de94522bf90fb190de63bf92bd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
[POWERPC] Fix ohare IDE irq workaround on old powermacs
[POWERPC] EEH: Power4 systems sometimes need multiple resets.
[POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
[POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
[POWERPC] Maple U3 HT - reject inappropriate config space access
[POWERPC] Fix IPIC pending register assignments
[POWERPC] powerpc: fix building gdb against asm/ptrace.h
[POWERPC] Remove DISCONTIGMEM cruft from page.h
[POWERPC] Merge iSeries i/o operations with the rest
[POWERPC] 40x: Fix debug status register defines
[POWERPC] Fix compile error in sbc8560
[POWERPC] EEH: support MMIO enable recovery step
[POWERPC] EEH: enable MMIO/DMA on frozen slot
[POWERPC] EEH: code comment cleanup
[POWERPC] EEH: balance pcidev_get/put calls
[POWERPC] PPC: Fix xmon stack frame address in backtrace
[POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
[POWERPC] Start arch/powerpc/boot code reorganization
[POWERPC] Define of_read_ulong helper
[POWERPC] iseries: eliminate a couple of warnings
...
Diffstat (limited to 'arch/powerpc/configs/maple_defconfig')
| -rw-r--r-- | arch/powerpc/configs/maple_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 2860be106f4f..62ba66091a13 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
| @@ -496,7 +496,7 @@ CONFIG_E1000=y | |||
| 496 | # CONFIG_SKY2 is not set | 496 | # CONFIG_SKY2 is not set |
| 497 | # CONFIG_SK98LIN is not set | 497 | # CONFIG_SK98LIN is not set |
| 498 | # CONFIG_VIA_VELOCITY is not set | 498 | # CONFIG_VIA_VELOCITY is not set |
| 499 | # CONFIG_TIGON3 is not set | 499 | CONFIG_TIGON3=y |
| 500 | # CONFIG_BNX2 is not set | 500 | # CONFIG_BNX2 is not set |
| 501 | # CONFIG_MV643XX_ETH is not set | 501 | # CONFIG_MV643XX_ETH is not set |
| 502 | 502 | ||