From: Linus Torvalds Date: Sat, 2 Dec 2006 00:44:02 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v2.6.20-rc2~6^2~13^2~474 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c3e59d1e891f6140a346de2b8547e25133c716b0;p=linux-2.6-omap-h63xx.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (31 commits) [MIPS] Remove duplicate ISA DMA code for 0 DMA channel case. [MIPS] Remove unused definition of cpu_to_lelongp() [MIPS] Remove userspace proofing from . [MIPS] Remove old junk left from old atomic_lock. [MIPS] Use conditional traps for BUG_ON on MIPS II and better. [MIPS] mips HPT cleanup: make clocksource_mips public [MIPS] do_IRQ cleanup [MIPS] Avoid dupliate D-cache flush on R400C / R4400 SC and MC variants. [MIPS] Remove redundant r4k_blast_icache() calls [MIPS] Work around bogus gcc warnings. [MIPS] Fix double inclusions [MIPS] use generic_handle_irq, handle_level_irq, handle_percpu_irq [MIPS] IRQ cleanups [MIPS] mips hpt cleanup: get rid of mips_hpt_init [MIPS] PB1200: Remove duplicate definitions [MIPS] Fix alignment hole in struct cache_desc; shrink struct. [MIPS] Oprofile: kernel support for the R10000. [MIPS] Remove unused R10000 performance counter definitions. [MIPS] Add support for kexec [MIPS] Don't print presence of WAIT instruction on bootup. ... --- c3e59d1e891f6140a346de2b8547e25133c716b0 diff --cc arch/mips/Kconfig index 22bb540b5c0,96143670759..27f83e64296 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@@ -864,8 -881,11 +881,11 @@@ config MIPS_NILE config MIPS_DISABLE_OBSOLETE_IDE bool + config GENERIC_ISA_DMA_SUPPORT_BROKEN + bool + # -# Endianess selection. Suffiently obscure so many users don't know what to +# Endianess selection. Sufficiently obscure so many users don't know what to # answer,so we try hard to limit the available choices. Also the use of a # choice statement should be more obvious to the user. #