diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/uwb/whc-rc.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/uwb/whc-rc.c')
| -rw-r--r-- | drivers/uwb/whc-rc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/whc-rc.c b/drivers/uwb/whc-rc.c index 73495583c444..70a004aa19db 100644 --- a/drivers/uwb/whc-rc.c +++ b/drivers/uwb/whc-rc.c | |||
| @@ -449,7 +449,7 @@ static int whcrc_post_reset(struct umc_dev *umc) | |||
| 449 | } | 449 | } |
| 450 | 450 | ||
| 451 | /* PCI device ID's that we handle [so it gets loaded] */ | 451 | /* PCI device ID's that we handle [so it gets loaded] */ |
| 452 | static struct pci_device_id whcrc_id_table[] = { | 452 | static struct pci_device_id __used whcrc_id_table[] = { |
| 453 | { PCI_DEVICE_CLASS(PCI_CLASS_WIRELESS_WHCI, ~0) }, | 453 | { PCI_DEVICE_CLASS(PCI_CLASS_WIRELESS_WHCI, ~0) }, |
| 454 | { /* empty last entry */ } | 454 | { /* empty last entry */ } |
| 455 | }; | 455 | }; |