diff --git a/[refs] b/[refs]
index acb4bc529e66..74bcd9177f81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a37f1381f1d8625fa458360c9b5d17f0c5f1dea
+refs/heads/master: 42b219322a97ccef347388b233aceaafe3fa517d
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index c8d95e369ff4..30faf4f3db0b 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -541,7 +541,7 @@ struct pci_error_handlers {
 struct module;
 struct pci_driver {
 	struct list_head node;
-	char *name;
+	const char *name;
 	const struct pci_device_id *id_table;	/* must be non-NULL for probe to be called */
 	int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);	/* New device inserted */
 	void (*remove) (struct pci_dev *dev);	/* Device removed (NULL if not a hot-plug capable driver) */