diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 19:31:53 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-03-01 19:31:53 +0100 |
| commit | 04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch) | |
| tree | d2f803b4eef6108648f1beee6bf97a342cd9bc73 /drivers/watchdog/alim1535_wdt.c | |
| parent | Input: imx_keypad - Propagate the real error code on platform_get_irq() failure (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.xz linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.zip | |
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'drivers/watchdog/alim1535_wdt.c')
| -rw-r--r-- | drivers/watchdog/alim1535_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c index fbb7b94cabfd..3a17fbd39f8a 100644 --- a/drivers/watchdog/alim1535_wdt.c +++ b/drivers/watchdog/alim1535_wdt.c @@ -301,7 +301,7 @@ static int ali_notify_sys(struct notifier_block *this, * want to register another driver on the same PCI id. */ -static DEFINE_PCI_DEVICE_TABLE(ali_pci_tbl) __used = { +static const struct pci_device_id ali_pci_tbl[] __used = { { PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,}, { PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,}, { 0, }, |