diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 20:26:49 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 20:26:49 +0400 |
| commit | 692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch) | |
| tree | a9e49c040d361ea2293a8966832378def5a06714 /drivers/mfd/sm501.c | |
| parent | e4dbedc7eac7da9db363a36f2bd4366962eeefcc (diff) | |
| parent | e2c3ecf0ea8e87c5209371af7da107ebc47a5639 (diff) | |
| download | linux-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.xz | |
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'drivers/mfd/sm501.c')
| -rw-r--r-- | drivers/mfd/sm501.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index c2c8c91c6c7b..e7dc441a8f8a 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c @@ -1710,7 +1710,7 @@ static int sm501_plat_remove(struct platform_device *dev) return 0; } -static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = { +static const struct pci_device_id sm501_pci_tbl[] = { { 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { 0, }, }; |