Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2005-05-05 13:59:37 +01:00
parent 488f2eaca1 b2d84f078a
commit bfd4bda097
225 changed files with 9902 additions and 3277 deletions
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1656,3 +1656,7 @@ config GENERIC_HARDIRQS
 config GENERIC_IRQ_PROBE
 	bool
 	default y
+
+config ISA_DMA_API
+	bool
+	default y