diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-26 17:45:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-26 17:45:18 -0500 |
| commit | 08eacc3157baf5d14c8e2c4ffc77c13a0ac8a85b (patch) | |
| tree | 6e43653d4ac5b6a5820eb8ec103f27768099afcd /arch | |
| parent | 496a0fc8c5572a626de41d56d7c7ed005a2c1b48 (diff) | |
| parent | 8cdf92a98fa0f91068615443f2a8597b7f2c34ca (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
Fix Maple PATA IRQ assignment.
ahci: use 0x80 as wait stat value instead of 0xff
sata_via: style clean up, no indirect method call in LLD
ahci: fix endianness in spurious interrupt message
libata-sff: Don't call bmdma_stop on non DMA capable controllers
libata: implement ATA_FLAG_IGN_SIMPLEX and use it in sata_uli
ahci: improve and limit spurious interrupt messages, take#3
sata_via: don't diddle with ATA_NIEN in ->freeze
libata: set_mode, Fix the FIXME
libata hpt3xn: Hopefully sort out the DPLL logic versus the vendor code
libata cmd64x: whack into a shape that looks like the documentation
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0855d55c194d..b268c417c0bf 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -484,6 +484,7 @@ config PPC_MAPLE | |||
| 484 | select PPC_970_NAP | 484 | select PPC_970_NAP |
| 485 | select PPC_NATIVE | 485 | select PPC_NATIVE |
| 486 | select PPC_RTAS | 486 | select PPC_RTAS |
| 487 | select ATA_NONSTANDARD if ATA | ||
| 487 | default n | 488 | default n |
| 488 | help | 489 | help |
| 489 | This option enables support for the Maple 970FX Evaluation Board. | 490 | This option enables support for the Maple 970FX Evaluation Board. |