diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-02 15:25:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-02 15:25:03 -0700 |
commit | f365ad5fc001cbd02968a376e0aecffe52ce79e1 (patch) | |
tree | 8677f1409e36c30f0f105249a63bf11d3993f32f /drivers | |
parent | 61ac7bf538db2044d0238fcd87b3d9df59294bf2 (diff) | |
parent | 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7 (diff) | |
download | kernel-crypto-f365ad5fc001cbd02968a376e0aecffe52ce79e1.tar.gz kernel-crypto-f365ad5fc001cbd02968a376e0aecffe52ce79e1.tar.xz kernel-crypto-f365ad5fc001cbd02968a376e0aecffe52ce79e1.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
[POWERPC] Export empty_zero_page and copy_page in arch/ppc
[POWERPC] Add "memory" clobber to MMIO accessors
[POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
electra_cf: Add MODULE_DEVICE_TABLE()
Diffstat (limited to 'drivers')
-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 0a6cea1316b..52d0aa8c2e7 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[] = { }, {}, }; +MODULE_DEVICE_TABLE(of, electra_cf_match); static struct of_platform_driver electra_cf_driver = { .name = (char *)driver_name, |