Index: arch/alpha/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/alpha/Kconfig,v
retrieving revision 1.13
diff -u -p -r1.13 Kconfig
--- arch/alpha/Kconfig  5 May 2003 17:05:24 -0000       1.13
+++ arch/alpha/Kconfig  9 Jun 2003 20:26:39 -0000
@@ -753,67 +753,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
-config IDE_MAX_HWIFS
-       int "Max IDE interfaces"
-       depends on IDE
-       default 4
-       help
-         This is the maximum number of IDE hardware interfaces that will
-         be supported by the driver. Make sure it is at least as high as
-         the number IDE interfaces in your system.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/arm/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/arm/Kconfig,v
retrieving revision 1.13
diff -u -p -r1.13 Kconfig
--- arch/arm/Kconfig    5 May 2003 17:05:26 -0000       1.13
+++ arch/arm/Kconfig    9 Jun 2003 20:27:25 -0000
@@ -949,58 +949,7 @@ source "net/irda/Kconfig"

source "net/ax25/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/cris/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/cris/Kconfig,v
retrieving revision 1.8
diff -u -p -r1.8 Kconfig
--- arch/cris/Kconfig   5 May 2003 17:05:32 -0000       1.8
+++ arch/cris/Kconfig   9 Jun 2003 20:27:33 -0000
@@ -556,15 +556,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

-
-menu "ATA/IDE/MFM/RLL support"
-
-config IDE
-       tristate "ATA/IDE/MFM/RLL support"
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/h8300/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/h8300/Kconfig,v
retrieving revision 1.3
diff -u -p -r1.3 Kconfig
--- arch/h8300/Kconfig  5 May 2003 17:05:34 -0000       1.3
+++ arch/h8300/Kconfig  9 Jun 2003 20:27:49 -0000
@@ -150,22 +150,7 @@ endmenu

source "drivers/block/Kconfig"

-
-menu "ATA/IDE/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         It only makes sense to choose this option if your board actually
-         has an IDE interface. If unsure, say N.
-
source "drivers/ide/Kconfig"
-
-endmenu

source "net/Kconfig"

Index: arch/i386/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/i386/Kconfig,v
retrieving revision 1.22
diff -u -p -r1.22 Kconfig
--- arch/i386/Kconfig   27 May 2003 17:21:14 -0000      1.22
+++ arch/i386/Kconfig   9 Jun 2003 20:28:16 -0000
@@ -1262,58 +1262,7 @@ source "drivers/pnp/Kconfig"

source "drivers/block/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL device support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI device support"
Index: arch/ia64/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/ia64/Kconfig,v
retrieving revision 1.12
diff -u -p -r1.12 Kconfig
--- arch/ia64/Kconfig   27 May 2003 17:21:18 -0000      1.12
+++ arch/ia64/Kconfig   9 Jun 2003 20:28:46 -0000
@@ -589,59 +589,6 @@ source "drivers/md/Kconfig"

source "drivers/message/fusion/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
-source "drivers/ide/Kconfig"
-
-endmenu
-
endif


Index: arch/m68k/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/m68k/Kconfig,v
retrieving revision 1.13
diff -u -p -r1.13 Kconfig
--- arch/m68k/Kconfig   5 May 2003 17:05:41 -0000       1.13
+++ arch/m68k/Kconfig   9 Jun 2003 20:28:57 -0000
@@ -655,58 +655,7 @@ source "drivers/md/Kconfig"

source "drivers/input/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL device support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI device support"
Index: arch/m68knommu/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/m68knommu/Kconfig,v
retrieving revision 1.10
diff -u -p -r1.10 Kconfig
--- arch/m68knommu/Kconfig      27 May 2003 17:21:31 -0000      1.10
+++ arch/m68knommu/Kconfig      9 Jun 2003 20:29:06 -0000
@@ -532,22 +532,7 @@ source "drivers/pnp/Kconfig"

source "drivers/block/Kconfig"

-
-menu "ATA/IDE/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         It only makes sense to choose this option if your board actually
-         has an IDE interface. If unsure, say N.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI device support"
Index: arch/mips/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/mips/Kconfig,v
retrieving revision 1.10
diff -u -p -r1.10 Kconfig
--- arch/mips/Kconfig   5 May 2003 17:05:43 -0000       1.10
+++ arch/mips/Kconfig   9 Jun 2003 20:29:17 -0000
@@ -827,59 +827,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-       depends on !SGI_IP22 && !DECSTATION
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/mips64/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/mips64/Kconfig,v
retrieving revision 1.12
diff -u -p -r1.12 Kconfig
--- arch/mips64/Kconfig 5 May 2003 17:05:47 -0000       1.12
+++ arch/mips64/Kconfig 9 Jun 2003 20:29:27 -0000
@@ -421,58 +421,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/parisc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/Kconfig,v
retrieving revision 1.18
diff -u -p -r1.18 Kconfig
--- arch/parisc/Kconfig 12 May 2003 11:49:49 -0000      1.18
+++ arch/parisc/Kconfig 9 Jun 2003 20:29:37 -0000
@@ -237,12 +237,8 @@ source "drivers/parport/Kconfig"

source "drivers/block/Kconfig"

-
-menu "ATA/IDE/MFM/RLL support"
-config IDE
-       tristate "ATA/IDE/MFM/RLL support"
source "drivers/ide/Kconfig"
-endmenu
+

menu "SCSI support"

Index: arch/ppc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/ppc/Kconfig,v
retrieving revision 1.12
diff -u -p -r1.12 Kconfig
--- arch/ppc/Kconfig    27 May 2003 17:21:39 -0000      1.12
+++ arch/ppc/Kconfig    9 Jun 2003 20:29:47 -0000
@@ -1182,55 +1182,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

-
-menu "ATA/IDE/MFM/RLL support"
-
-config IDE
-       tristate "ATA/IDE/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984.  Quite a number of
-         disks use the IDE interface.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/ppc64/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/ppc64/Kconfig,v
retrieving revision 1.11
diff -u -p -r1.11 Kconfig
--- arch/ppc64/Kconfig  5 May 2003 17:05:54 -0000       1.11
+++ arch/ppc64/Kconfig  9 Jun 2003 20:29:57 -0000
@@ -268,55 +268,7 @@ source "drivers/pnp/Kconfig"

source "drivers/block/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984.  Quite a number of
-         disks use the IDE interface.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI device support"
Index: arch/sh/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/sh/Kconfig,v
retrieving revision 1.10
diff -u -p -r1.10 Kconfig
--- arch/sh/Kconfig     5 May 2003 17:05:58 -0000       1.10
+++ arch/sh/Kconfig     9 Jun 2003 20:30:09 -0000
@@ -657,58 +657,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/sparc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/sparc/Kconfig,v
retrieving revision 1.13
diff -u -p -r1.13 Kconfig
--- arch/sparc/Kconfig  27 May 2003 17:21:58 -0000      1.13
+++ arch/sparc/Kconfig  9 Jun 2003 20:30:29 -0000
@@ -547,57 +547,7 @@ endmenu
# Don't frighten a common SBus user
if PCI

-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu

endif

Index: arch/sparc64/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/sparc64/Kconfig,v
retrieving revision 1.14
diff -u -p -r1.14 Kconfig
--- arch/sparc64/Kconfig        27 May 2003 17:22:04 -0000      1.14
+++ arch/sparc64/Kconfig        9 Jun 2003 20:30:43 -0000
@@ -719,57 +719,7 @@ config BLK_DEV_INITRD
endmenu


-menu "ATA/ATAPI/MFM/RLL device support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself don't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters disk.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI support"
Index: arch/v850/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/v850/Kconfig,v
retrieving revision 1.11
diff -u -p -r1.11 Kconfig
--- arch/v850/Kconfig   5 May 2003 17:06:09 -0000       1.11
+++ arch/v850/Kconfig   9 Jun 2003 20:31:00 -0000
@@ -270,16 +270,6 @@ source drivers/block/Kconfig

menu "Disk device support"

-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-        If you say Y here, your kernel will be able to manage low cost mass
-        storage units such as ATA/(E)IDE and ATAPI units. The most common
-        cases are IDE hard drives and ATAPI CD-ROM drives.
-
-        It only makes sense to choose this option if your board actually
-        has an IDE interface. If unsure, say N.
-
source "drivers/ide/Kconfig"

config SCSI
Index: arch/x86_64/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/x86_64/Kconfig,v
retrieving revision 1.17
diff -u -p -r1.17 Kconfig
--- arch/x86_64/Kconfig 27 May 2003 17:22:13 -0000      1.17
+++ arch/x86_64/Kconfig 9 Jun 2003 20:31:28 -0000
@@ -415,58 +415,7 @@ source "drivers/parport/Kconfig"

source "drivers/block/Kconfig"

-
-menu "ATA/ATAPI/MFM/RLL support"
-
-config IDE
-       tristate "ATA/ATAPI/MFM/RLL device support"
-       ---help---
-         If you say Y here, your kernel will be able to manage low cost mass
-         storage units such as ATA/(E)IDE and ATAPI units. The most common
-         cases are IDE hard drives and ATAPI CD-ROM drives.
-
-         If your system is pure SCSI and doesn't use these interfaces, you
-         can say N here.
-
-         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
-         for mass storage units such as hard disks. It was designed by
-         Western Digital and Compaq Computer in 1984. It was then named
-         ST506. Quite a number of disks use the IDE interface.
-
-         AT Attachment (ATA) is the superset of the IDE specifications.
-         ST506 was also called ATA-1.
-
-         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
-         ATA-3. It provides support for larger disks (up to 8.4GB by means of
-         the LBA standard), more disks (4 instead of 2) and for other mass
-         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
-         ATA-4 and provides faster (and more CPU friendly) transfer modes
-         than previous PIO (Programmed processor Input/Output) from previous
-         ATA/IDE standards by means of fast DMA controllers.
-
-         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
-         CD-ROM drives, similar in many respects to the SCSI protocol.
-
-         SMART IDE (Self-Monitoring, Analysis and Reporting Technology) was
-         designed in order to prevent data corruption and disk crash by
-         detecting pre-hardware failure conditions (heat, access time, and
-         the like...). Disks built since June 1995 may follow this standard.
-         The kernel itself doesn't manage this; however there are quite a
-         number of user programs such as smart that can query the status of
-         SMART parameters from disk drives.
-
-         If you want to compile this driver as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>. The module
-         will be called ide.
-
-         For further information, please read <file:Documentation/ide.txt>.
-
-         If unsure, say Y.
-
source "drivers/ide/Kconfig"
-
-endmenu


menu "SCSI device support"
Index: drivers/ide/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/ide/Kconfig,v
retrieving revision 1.10
diff -u -p -r1.10 Kconfig
--- drivers/ide/Kconfig 27 May 2003 17:23:16 -0000      1.10
+++ drivers/ide/Kconfig 9 Jun 2003 20:26:28 -0000
@@ -4,6 +4,63 @@
# Andre Hedrick <[email protected]>
#

+menu "ATA/ATAPI/MFM/RLL support"
+
+config IDE
+       tristate "ATA/ATAPI/MFM/RLL support"
+       ---help---
+         If you say Y here, your kernel will be able to manage low cost mass
+         storage units such as ATA/(E)IDE and ATAPI units. The most common
+         cases are IDE hard drives and ATAPI CD-ROM drives.
+
+         If your system is pure SCSI and doesn't use these interfaces, you
+         can say N here.
+
+         Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
+         for mass storage units such as hard disks. It was designed by
+         Western Digital and Compaq Computer in 1984. It was then named
+         ST506. Quite a number of disks use the IDE interface.
+
+         AT Attachment (ATA) is the superset of the IDE specifications.
+         ST506 was also called ATA-1.
+
+         Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
+         ATA-3. It provides support for larger disks (up to 8.4GB by means of
+         the LBA standard), more disks (4 instead of 2) and for other mass
+         storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
+         ATA-4 and provides faster (and more CPU friendly) transfer modes
+         than previous PIO (Programmed processor Input/Output) from previous
+         ATA/IDE standards by means of fast DMA controllers.
+
+         ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
+         CD-ROM drives, similar in many respects to the SCSI protocol.
+
+         SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
+         designed in order to prevent data corruption and disk crash by
+         detecting pre hardware failure conditions (heat, access time, and
+         the like...). Disks built since June 1995 may follow this standard.
+         The kernel itself don't manage this; however there are quite a
+         number of user programs such as smart that can query the status of
+         SMART parameters disk.
+
+         If you want to compile this driver as a module ( = code which can be
+         inserted in and removed from the running kernel whenever you want),
+         say M here and read <file:Documentation/modules.txt>. The module
+         will be called ide.
+
+         For further information, please read <file:Documentation/ide.txt>.
+
+         If unsure, say Y.
+
+config IDE_MAX_HWIFS
+       int "Max IDE interfaces"
+       depends on ALPHA && IDE
+       default 4
+       help
+         This is the maximum number of IDE hardware interfaces that will
+         be supported by the driver. Make sure it is at least as high as
+         the number of IDE interfaces in your system.
+
menu "IDE, ATA and ATAPI Block devices"
       depends on IDE!=n

@@ -1083,3 +1140,4 @@ config BLK_DEV_IDE_MODES

endmenu

+endmenu