diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-19 19:04:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-19 19:04:41 +0100 |
commit | ed30b147e1f6e396e70a52dbb6c7d66befedd786 (patch) | |
tree | 216c9108209d5ee4b5b7b5481be5db82d46bfa50 /drivers/ide | |
parent | clean up x86 platform driver default values (diff) | |
parent | PNP: ide: constify pnp_device_id (diff) | |
download | linux-ed30b147e1f6e396e70a52dbb6c7d66befedd786.tar.xz linux-ed30b147e1f6e396e70a52dbb6c7d66befedd786.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull small IDE cleanup from David Miller.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
PNP: ide: constify pnp_device_id
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-pnp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c index f5f2b62471da..859ddab9448f 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 = ""} |