diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/pcmcia | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/electra_cf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index 0a6cea1316b4..52d0aa8c2e7a 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
| @@ -352,6 +352,7 @@ static struct of_device_id electra_cf_match[] = { | |||
| 352 | }, | 352 | }, |
| 353 | {}, | 353 | {}, |
| 354 | }; | 354 | }; |
| 355 | MODULE_DEVICE_TABLE(of, electra_cf_match); | ||
| 355 | 356 | ||
| 356 | static struct of_platform_driver electra_cf_driver = { | 357 | static struct of_platform_driver electra_cf_driver = { |
| 357 | .name = (char *)driver_name, | 358 | .name = (char *)driver_name, |