diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 (patch) | |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 /drivers/net/fsl_pq_mdio.c | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 (diff) | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff) | |
Merge branch 'for-linus' into for-2.6.33
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/net/fsl_pq_mdio.c')
| -rw-r--r-- | drivers/net/fsl_pq_mdio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c index d167090248e2..6ac464866972 100644 --- a/drivers/net/fsl_pq_mdio.c +++ b/drivers/net/fsl_pq_mdio.c | |||
| @@ -407,6 +407,7 @@ static struct of_device_id fsl_pq_mdio_match[] = { | |||
| 407 | }, | 407 | }, |
| 408 | {}, | 408 | {}, |
| 409 | }; | 409 | }; |
| 410 | MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match); | ||
| 410 | 411 | ||
| 411 | static struct of_platform_driver fsl_pq_mdio_driver = { | 412 | static struct of_platform_driver fsl_pq_mdio_driver = { |
| 412 | .name = "fsl-pq_mdio", | 413 | .name = "fsl-pq_mdio", |