6 files changed, 3 insertions, 8 deletions
diff --git a/src/include/ipxe/device.h b/src/include/ipxe/device.h
index 635ce59cc..435af6ecf 100644
--- a/src/include/ipxe/device.h
+++ b/src/include/ipxe/device.h
@@ -58,6 +58,8 @@ struct device_description {
 struct device {
 	/** Name */
 	char name[16];
+	/** Driver name */
+	const char *driver_name;
 	/** Device description */
 	struct device_description desc;
 	/** Devices on the same bus */
diff --git a/src/include/ipxe/eisa.h b/src/include/ipxe/eisa.h
index 1588f8114..22a1ed94e 100644
--- a/src/include/ipxe/eisa.h
+++ b/src/include/ipxe/eisa.h
@@ -54,8 +54,6 @@ struct eisa_device {
 	 * this field.
 	 */
 	void *priv;
-	/** Driver name */
-	const char *driver_name;
 };
 
 /** An EISA driver */
diff --git a/src/include/ipxe/isa.h b/src/include/ipxe/isa.h
index 6d8f76161..4e69fc6f7 100644
--- a/src/include/ipxe/isa.h
+++ b/src/include/ipxe/isa.h
@@ -22,8 +22,6 @@ struct isa_device {
 	 * this field.
 	 */
 	void *priv;
-	/** Driver name */
-	const char *driver_name;
 };
 
 /*
diff --git a/src/include/ipxe/isapnp.h b/src/include/ipxe/isapnp.h
index f2b0b34ac..47a47025b 100644
--- a/src/include/ipxe/isapnp.h
+++ b/src/include/ipxe/isapnp.h
@@ -198,8 +198,6 @@ struct isapnp_device {
 	 * this field.
 	 */
 	void *priv;
-	/** Driver name */
-	const char *driver_name;
 };
 
 /** An ISAPnP driver */
diff --git a/src/include/ipxe/mca.h b/src/include/ipxe/mca.h
index 79543c1a0..d86dab195 100644
--- a/src/include/ipxe/mca.h
+++ b/src/include/ipxe/mca.h
@@ -50,8 +50,6 @@ struct mca_device {
 	 * this field.
 	 */
 	void *priv;
-	/** Driver name */
-	const char *driver_name;
 };
 
 #define MCA_ID(mca) ( ( (mca)->pos[1] << 8 ) + (mca)->pos[0] )
diff --git a/src/include/ipxe/pci.h b/src/include/ipxe/pci.h
index 90802a3f1..960454d69 100644
--- a/src/include/ipxe/pci.h
+++ b/src/include/ipxe/pci.h
@@ -410,6 +410,7 @@ static inline void pci_set_driver ( struct pci_device *pci,
 				    struct pci_device_id *id ) {
 	pci->driver = driver;
 	pci->id = id;
+	pci->dev.driver_name = id->name;
 }
 
 /**