From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 18 Mar 2007 00:00:48 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.21-rc5~69
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f8dd8505e005df1711722664d12865cc8b3da4d;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: remove CONFIG_IDEDMA_{ICS,PCI}_AUTO config options
  ide: don't allow DMA to be enabled if CONFIG_IDEDMA_{ICS,PCI}_AUTO=n
  scc_pata: dependency fix
  jmicron: make ide jmicron driver play nice with libata ones
  ide: remove static prototypes from include/asm-mips/mach-au1x00/au1xxx_ide.h
  ide: au1xxx: fix use of mixed declarations and code
  cmd64x: fix recovery time calculation (take 3)
---

2f8dd8505e005df1711722664d12865cc8b3da4d