diff options
author | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-08 17:56:47 +1000 |
commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /drivers/staging/meilhaus/me1600_device.c | |
parent | integrity: remove __setup auditing msgs (diff) | |
parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
download | linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-dev-d254117099d711f215e62427f55dfb8ebd5ad011.zip |
Merge branch 'master' into next
Diffstat (limited to 'drivers/staging/meilhaus/me1600_device.c')
-rw-r--r-- | drivers/staging/meilhaus/me1600_device.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/meilhaus/me1600_device.c b/drivers/staging/meilhaus/me1600_device.c index 3bc2cb1dc869..c244e984049e 100644 --- a/drivers/staging/meilhaus/me1600_device.c +++ b/drivers/staging/meilhaus/me1600_device.c @@ -48,7 +48,7 @@ #include "mesubdevice.h" #include "me1600_device.h" -static void me1600_set_registry(me1600_device_t * subdevice, uint32_t reg_base); +static void me1600_set_registry(me1600_device_t *subdevice, uint32_t reg_base); static void me1600_destructor(struct me_device *device); /** @@ -142,6 +142,7 @@ me_device_t *me1600_pci_constructor(struct pci_dev *pci_device) return (me_device_t *) me1600_device; } +EXPORT_SYMBOL(me1600_pci_constructor); static void me1600_destructor(struct me_device *device) { @@ -157,7 +158,7 @@ static void me1600_destructor(struct me_device *device) kfree(me1600_device); } -static void me1600_set_registry(me1600_device_t * subdevice, uint32_t reg_base) +static void me1600_set_registry(me1600_device_t *subdevice, uint32_t reg_base) { // Create shadow structure. if (subdevice->ao_regs_shadows.count >= 1) { subdevice->ao_regs_shadows.registry[0] = @@ -256,6 +257,3 @@ MODULE_AUTHOR MODULE_DESCRIPTION("Device Driver Module for ME-1600 Device"); MODULE_SUPPORTED_DEVICE("Meilhaus ME-1600 Devices"); MODULE_LICENSE("GPL"); - -// Export the constructor. -EXPORT_SYMBOL(me1600_pci_constructor); |