首页 发现 帮助
注册 登录
phyus
/
linux-vybrid_public
8
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

ARM: always select HAVE_IDE

It's plain wrong for PCMCIA to select HAVE_IDE that implies e.g. the
availability of an asm/ide.h

It turns out this was done for ARM, and we can simply always select 
HAVE_IDE on ARM instead of manually tracking which platforms might 
possible have an IDE controller directly or indirectly.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Adrian Bunk 17 年之前
父节点
3f31b87460
当前提交
2064c946ea
共有 2 个文件被更改，包括 1 次插入 和 15 次删除
合并视图 显示文件统计
  1. 1 14
      arch/arm/Kconfig
  2. 0 1
      drivers/pcmcia/Kconfig

+ 1 - 14
arch/arm/Kconfig
查看文件 

@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"
 
 config ARM
 
 config ARM
 
 	bool
 
 	bool
 
 	default y
 
 	default y
 
+	select HAVE_IDE
 
 	select RTC_LIB
 
 	select RTC_LIB
 
 	select SYS_SUPPORTS_APM_EMULATION
 
 	select SYS_SUPPORTS_APM_EMULATION
 
 	select HAVE_OPROFILE
 
 	select HAVE_OPROFILE
 
@@ -223,7 +224,6 @@ config ARCH_CLPS7500
 
 	select TIMER_ACORN
 
 	select TIMER_ACORN
 
 	select ISA
 
 	select ISA
 
 	select NO_IOPORT
 
 	select NO_IOPORT
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
 	  Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
 
 
@@ -236,7 +236,6 @@ config ARCH_CO285
 
 	bool "Co-EBSA285"
 
 	bool "Co-EBSA285"
 
 	select FOOTBRIDGE
 
 	select FOOTBRIDGE
 
 	select FOOTBRIDGE_ADDIN
 
 	select FOOTBRIDGE_ADDIN
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Support for Intel's EBSA285 companion chip.
 
 	  Support for Intel's EBSA285 companion chip.
 
 
 
@@ -262,7 +261,6 @@ config ARCH_EP93XX
 
 config ARCH_FOOTBRIDGE
 
 config ARCH_FOOTBRIDGE
 
 	bool "FootBridge"
 
 	bool "FootBridge"
 
 	select FOOTBRIDGE
 
 	select FOOTBRIDGE
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Support for systems based on the DC21285 companion chip
 
 	  Support for systems based on the DC21285 companion chip
 
 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
@@ -301,7 +299,6 @@ config ARCH_IOP32X
 
 	depends on MMU
 
 	depends on MMU
 
 	select PLAT_IOP
 
 	select PLAT_IOP
 
 	select PCI
 
 	select PCI
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Support for Intel's 80219 and IOP32X (XScale) family of
 
 	  Support for Intel's 80219 and IOP32X (XScale) family of
 
 	  processors.
 
 	  processors.
 
@@ -311,14 +308,12 @@ config ARCH_IOP33X
 
 	depends on MMU
 
 	depends on MMU
 
 	select PLAT_IOP
 
 	select PLAT_IOP
 
 	select PCI
 
 	select PCI
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Support for Intel's IOP33X (XScale) family of processors.
 
 	  Support for Intel's IOP33X (XScale) family of processors.
 
 
 
 config ARCH_IXP23XX
 
 config ARCH_IXP23XX
 
  	bool "IXP23XX-based"
 
  	bool "IXP23XX-based"
 
 	depends on MMU
 
 	depends on MMU
 
-	select HAVE_IDE
 
  	select PCI
 
  	select PCI
 
 	help
 
 	help
 
 	  Support for Intel's IXP23xx (XScale) family of processors.
 
 	  Support for Intel's IXP23xx (XScale) family of processors.
 
@@ -336,14 +331,12 @@ config ARCH_IXP4XX
 
 	select GENERIC_GPIO
 
 	select GENERIC_GPIO
 
 	select GENERIC_TIME
 
 	select GENERIC_TIME
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Support for Intel's IXP4XX (XScale) family of processors.
 
 	  Support for Intel's IXP4XX (XScale) family of processors.
 
 
 
 config ARCH_L7200
 
 config ARCH_L7200
 
 	bool "LinkUp-L7200"
 
 	bool "LinkUp-L7200"
 
 	select FIQ
 
 	select FIQ
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Say Y here if you intend to run this kernel on a LinkUp Systems
 
 	  Say Y here if you intend to run this kernel on a LinkUp Systems
 
 	  L7200 Software Development Board which uses an ARM720T processor.
 
 	  L7200 Software Development Board which uses an ARM720T processor.
 
@@ -400,7 +393,6 @@ config ARCH_PXA
 
 	depends on MMU
 
 	depends on MMU
 
 	select ARCH_MTD_XIP
 
 	select ARCH_MTD_XIP
 
 	select GENERIC_GPIO
 
 	select GENERIC_GPIO
 
-	select HAVE_IDE
 
 	select HAVE_GPIO_LIB
 
 	select HAVE_GPIO_LIB
 
 	select GENERIC_TIME
 
 	select GENERIC_TIME
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
@@ -416,7 +408,6 @@ config ARCH_RPC
 
 	select ARCH_MAY_HAVE_PC_FDC
 
 	select ARCH_MAY_HAVE_PC_FDC
 
 	select ISA_DMA_API
 
 	select ISA_DMA_API
 
 	select NO_IOPORT
 
 	select NO_IOPORT
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and
 
 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and
 
 	  CD-ROM interface, serial and parallel port, and the floppy drive.
 
 	  CD-ROM interface, serial and parallel port, and the floppy drive.
 
@@ -432,7 +423,6 @@ config ARCH_SA1100
 
 	select GENERIC_TIME
 
 	select GENERIC_TIME
 
 	select GENERIC_CLOCKEVENTS
 
 	select GENERIC_CLOCKEVENTS
 
 	select TICK_ONESHOT
 
 	select TICK_ONESHOT
 
-	select HAVE_IDE
 
 	select HAVE_GPIO_LIB
 
 	select HAVE_GPIO_LIB
 
 	help
 
 	help
 
 	  Support for StrongARM 11x0 based boards.
 
 	  Support for StrongARM 11x0 based boards.
 
@@ -440,7 +430,6 @@ config ARCH_SA1100
 
 config ARCH_S3C2410
 
 config ARCH_S3C2410
 
 	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
 
 	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
 
 	select GENERIC_GPIO
 
 	select GENERIC_GPIO
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
 
 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
 
 	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
 
 	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
 
@@ -448,7 +437,6 @@ config ARCH_S3C2410
 
 
 
 config ARCH_SHARK
 
 config ARCH_SHARK
 
 	bool "Shark"
 
 	bool "Shark"
 
-	select HAVE_IDE
 
 	select ISA
 
 	select ISA
 
 	select ISA_DMA
 
 	select ISA_DMA
 
 	select PCI
 
 	select PCI
 
@@ -458,7 +446,6 @@ config ARCH_SHARK
 
 
 
 config ARCH_LH7A40X
 
 config ARCH_LH7A40X
 
 	bool "Sharp LH7A40X"
 
 	bool "Sharp LH7A40X"
 
-	select HAVE_IDE
 
 	help
 
 	help
 
 	  Say Y here for systems based on one of the Sharp LH7A40X
 
 	  Say Y here for systems based on one of the Sharp LH7A40X
 
 	  System on a Chip processors.  These CPUs include an ARM922T
 
 	  System on a Chip processors.  These CPUs include an ARM922T

+ 0 - 1
drivers/pcmcia/Kconfig
查看文件 

@@ -38,7 +38,6 @@ config PCMCIA_DEBUG
 
 config PCMCIA
 
 config PCMCIA
 
 	tristate "16-bit PCMCIA support"
 
 	tristate "16-bit PCMCIA support"
 
 	select CRC32
 
 	select CRC32
 
-	select HAVE_IDE
 
 	default y
 
 	default y
 
 	---help---
 
 	---help---
 
 	   This option enables support for 16-bit PCMCIA cards. Most older
 
 	   This option enables support for 16-bit PCMCIA cards. Most older