Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6

[powerpc.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 58c1deb..b4c8319 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -406,20 +406,6 @@ config BLK_DEV_RAM_BLOCKSIZE
          setups function - apparently needed by the rd_load_image routine
          that supposes the filesystem in the image uses a 1024 blocksize.
 
          setups function - apparently needed by the rd_load_image routine
          that supposes the filesystem in the image uses a 1024 blocksize.
 

-config BLK_DEV_INITRD
-       bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
-       depends on BROKEN || !FRV
-       help
-         The initial RAM filesystem is a ramfs which is loaded by the
-         boot loader (loadlin or lilo) and that is mounted as root
-         before the normal boot procedure. It is typically used to
-         load modules needed to mount the "real" root file system,
-         etc. See <file:Documentation/initrd.txt> for details.
-
-         If RAM disk support (BLK_DEV_RAM) is also included, this
-         also enables initial RAM disk (initrd) support.
-
-

 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"
        depends on !UML
 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"
        depends on !UML


@@ -458,8 +444,6 @@ config CDROM_PKTCDVD_WCACHE
          this option is dangerous unless the CD-RW media is known good, as we
          don't do deferred write error handling yet.
 
          this option is dangerous unless the CD-RW media is known good, as we
          don't do deferred write error handling yet.
 

-source "drivers/s390/block/Kconfig"
-

 config ATA_OVER_ETH
        tristate "ATA over Ethernet support"
        depends on NET
 config ATA_OVER_ETH
        tristate "ATA over Ethernet support"
        depends on NET


@@ -467,6 +451,8 @@ config ATA_OVER_ETH
        This driver provides Support for ATA over Ethernet block
        devices like the Coraid EtherDrive (R) Storage Blade.
 
        This driver provides Support for ATA over Ethernet block
        devices like the Coraid EtherDrive (R) Storage Blade.
 

+source "drivers/s390/block/Kconfig"
+

 endmenu
 
 endif
 endmenu
 
 endif