Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

ed30b147 · Linus Torvalds <[email protected]> · 2017-11-19 08:04:41 -10:00

Pull small IDE cleanup from David Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  PNP: ide: constify pnp_device_id

Merge commit. Changes below are compared with the first parent: 0192f175.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/ide/ide-pnp.c	modified	+1	−1	View file

diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index f5f2b62..859ddab 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -22,7 +22,7 @@
 #define DRV_NAME "ide-pnp"
 
 /* Add your devices here :)) */
-static struct pnp_device_id idepnp_devices[] = {
+static const struct pnp_device_id idepnp_devices[] = {
 	/* Generic ESDI/IDE/ATA compatible hard disk controller */
 	{.id = "PNP0600", .driver_data = 0},
 	{.id = ""}