diff options
| author | Rob Herring <r.herring@freescale.com> | 2008-02-14 14:44:21 -0600 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2008-08-25 15:18:55 -0400 |
| commit | 3f8ed3afb9cee6648f9650d5daf950bb9347cca6 (patch) | |
| tree | c9e28cdb34524d44c5dc4dc0778ebdcb858af20c /drivers/ide/Kconfig | |
| parent | 49914084e797530d9baaf51df9eda77babc98fa8 (diff) | |
ENGR00065563 Merge L2622-01 to 2.6.24
Merge L2622-01 release to 2.6.24 kernel.
Diffstat (limited to 'drivers/ide/Kconfig')
| -rw-r--r-- | drivers/ide/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index fb06555708a8..94e1958b952d 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -887,6 +887,13 @@ config BLK_DEV_IDE_BAST Say Y here if you want to support the onboard IDE channels on the Simtec BAST or the Thorcom VR1000 +config BLK_DEV_IDE_MXC + tristate "Freescale MXC IDE support" + depends on ARM && ( ARCH_MX3 || ARCH_MX27 || ARCH_MX33) + help + Say Y here if you want to support the IDE controller on the + Freescale iMX3 processor. + config ETRAX_IDE bool "ETRAX IDE support" depends on CRIS && BROKEN @@ -1111,7 +1118,7 @@ config BLK_DEV_UMC8672 endif config BLK_DEV_IDEDMA - def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA + def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA || BLK_DEV_IDE_MXC config IDE_ARCH_OBSOLETE_INIT def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC |