summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 14:45:18 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 14:45:18 -0800
commit08eacc3157baf5d14c8e2c4ffc77c13a0ac8a85b (patch)
tree6e43653d4ac5b6a5820eb8ec103f27768099afcd /arch
parent496a0fc8c5572a626de41d56d7c7ed005a2c1b48 (diff)
parent8cdf92a98fa0f91068615443f2a8597b7f2c34ca (diff)
downloadlinux-3.10-08eacc3157baf5d14c8e2c4ffc77c13a0ac8a85b.tar.gz
linux-3.10-08eacc3157baf5d14c8e2c4ffc77c13a0ac8a85b.tar.bz2
linux-3.10-08eacc3157baf5d14c8e2c4ffc77c13a0ac8a85b.zip
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/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0855d55c194..b268c417c0b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -484,6 +484,7 @@ config PPC_MAPLE
select PPC_970_NAP
select PPC_NATIVE
select PPC_RTAS
+ select ATA_NONSTANDARD if ATA
default n
help
This option enables support for the Maple 970FX Evaluation Board.