[PATCH] EDD: move code from i386-specific locations to generic

From: Matt Domsch <Matt_Domsch@dell.com>

move edd.c from arch/i386/kernel to new dir drivers/firmware.  Fix up
makefiles and Kconfigs.

arch/i386/Kconfig

@@ -637,16 +637,7 @@ config X86_CPUID
 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
 	  /dev/cpu/31/cpuid.
 
-config EDD
-	tristate "BIOS Enhanced Disk Drive calls determine boot disk (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
-	help
-	  Say Y or M here if you want to enable BIOS Enhanced Disk Drive
-	  Services real mode BIOS calls to determine which disk
-	  BIOS tries boot from.  This information is then exported via driverfs.
-
-	  This option is experimental, but believed to be safe,
-	  and most disk controller BIOS vendors do not yet implement this feature.
+source "drivers/firmware/Kconfig"
 
 choice
 	prompt "High Memory Support"

arch/i386/kernel/Makefile

@@ -25,7 +25,6 @@ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit.o
-obj-$(CONFIG_EDD)             	+= edd.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-y				+= sysenter.o vsyscall.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat.o

drivers/Makefile

@@ -49,3 +49,4 @@ obj-$(CONFIG_ISDN)		+= isdn/
 obj-$(CONFIG_MCA)		+= mca/
 obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
+obj-y				+= firmware/

drivers/firmware/Kconfig

+#
+# For a description of the syntax of this configuration file,
+# see Documentation/kbuild/kconfig-language.txt.
+#
+
+menu "Firmware Drivers"
+
+config EDD
+	tristate "BIOS Enhanced Disk Drive calls determine boot disk (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	help
+	  Say Y or M here if you want to enable BIOS Enhanced Disk Drive
+	  Services real mode BIOS calls to determine which disk
+	  BIOS tries boot from.  This information is then exported via driverfs.
+
+	  This option is experimental, but believed to be safe,
+	  and most disk controller BIOS vendors do not yet implement this feature.
+
+endmenu

drivers/firmware/Makefile

+#
+# Makefile for the linux kernel.
+#
+obj-$(CONFIG_EDD)             	+= edd.o

arch/i386/kernel/edd.c → drivers/firmware/edd.c

@@ -52,7 +52,7 @@
 #include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/blkdev.h>
-#include <asm/edd.h>
+#include <linux/edd.h>
 /* FIXME - this really belongs in include/scsi/scsi.h */
 #include <../drivers/scsi/scsi.h>
 #include <../drivers/scsi/hosts.h>
@@ -658,7 +658,7 @@ struct edd_match_data {
  * edd_match_scsidev()
  * @edev - EDD device is a known SCSI device
  * @sd - scsi_device with host who's parent is a PCI controller
- * 
+ *
  * returns 1 if a match is found, 0 if not.
  */
 static int edd_match_scsidev(struct device * dev, void * d)
@@ -682,7 +682,7 @@ static int edd_match_scsidev(struct device * dev, void * d)
  * edd_find_matching_device()
  * @edev - edd_device to match
  *
- * Search the SCSI devices for a drive that matches the EDD 
+ * Search the SCSI devices for a drive that matches the EDD
  * device descriptor we have. If we find a match, return it,
  * otherwise, return NULL.
  */