diff options
| author | merging other branches <null@invalid> | 2008-11-26 16:07:01 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-26 16:07:01 +0000 |
| commit | 6d2c293d6578048e7b71e0c44897144f15f350ae (patch) | |
| tree | cba36be2a06ee7bfa0aab1a3c7d36bd67ea37402 /drivers/mfd/pcf50633-core.c | |
| parent | 524f4a1dfe71a8b353a244140164e09828abb68c (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean
balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266
Diffstat (limited to 'drivers/mfd/pcf50633-core.c')
| -rw-r--r-- | drivers/mfd/pcf50633-core.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 6d66b526bc2..dd6a7949182 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -48,7 +48,7 @@ int pcf50633_read_block(struct pcf50633 *pcf , u8 reg, return ret; } -EXPORT_SYMBOL(pcf50633_read_block); +EXPORT_SYMBOL_GPL(pcf50633_read_block); /* Write a block of upto 32 regs */ int pcf50633_write_block(struct pcf50633 *pcf , u8 reg, @@ -63,7 +63,7 @@ int pcf50633_write_block(struct pcf50633 *pcf , u8 reg, return ret; } -EXPORT_SYMBOL(pcf50633_write_block); +EXPORT_SYMBOL_GPL(pcf50633_write_block); u8 pcf50633_reg_read(struct pcf50633 *pcf, u8 reg) { @@ -75,7 +75,7 @@ u8 pcf50633_reg_read(struct pcf50633 *pcf, u8 reg) return ret; } -EXPORT_SYMBOL(pcf50633_reg_read); +EXPORT_SYMBOL_GPL(pcf50633_reg_read); int pcf50633_reg_write(struct pcf50633 *pcf, u8 reg, u8 val) { @@ -86,7 +86,7 @@ int pcf50633_reg_write(struct pcf50633 *pcf, u8 reg, u8 val) return ret; } -EXPORT_SYMBOL(pcf50633_reg_write); +EXPORT_SYMBOL_GPL(pcf50633_reg_write); int pcf50633_reg_set_bit_mask(struct pcf50633 *pcf, u8 reg, u8 mask, u8 val) { @@ -106,7 +106,7 @@ int pcf50633_reg_set_bit_mask(struct pcf50633 *pcf, u8 reg, u8 mask, u8 val) return ret; } -EXPORT_SYMBOL(pcf50633_reg_set_bit_mask); +EXPORT_SYMBOL_GPL(pcf50633_reg_set_bit_mask); int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 val) { @@ -123,7 +123,7 @@ int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 val) return ret; } -EXPORT_SYMBOL(pcf50633_reg_clear_bits); +EXPORT_SYMBOL_GPL(pcf50633_reg_clear_bits); /* sysfs attributes */ static ssize_t show_dump_regs(struct device *dev, struct device_attribute *attr, @@ -226,7 +226,7 @@ int pcf50633_irq_mask(struct pcf50633 *pcf, int irq) return pcf50633_irq_mask_set(pcf, irq, 1); } -EXPORT_SYMBOL(pcf50633_irq_mask); +EXPORT_SYMBOL_GPL(pcf50633_irq_mask); int pcf50633_irq_unmask(struct pcf50633 *pcf, int irq) { @@ -234,7 +234,7 @@ int pcf50633_irq_unmask(struct pcf50633 *pcf, int irq) return pcf50633_irq_mask_set(pcf, irq, 0); } -EXPORT_SYMBOL(pcf50633_irq_unmask); +EXPORT_SYMBOL_GPL(pcf50633_irq_unmask); int pcf50633_irq_mask_get(struct pcf50633 *pcf, int irq) { @@ -245,7 +245,7 @@ int pcf50633_irq_mask_get(struct pcf50633 *pcf, int irq) return pcf->mask_regs[reg] & bits; } -EXPORT_SYMBOL(pcf50633_irq_mask_get); +EXPORT_SYMBOL_GPL(pcf50633_irq_mask_get); static void pcf50633_irq_call_handler(struct pcf50633 *pcf, int irq) @@ -485,7 +485,7 @@ static int pcf50633_probe(struct i2c_client *client, pcf->pdata = pdata; pdata->pcf = pcf; - + mutex_init(&pcf->lock); i2c_set_clientdata(client, pcf); @@ -502,7 +502,7 @@ static int pcf50633_probe(struct i2c_client *client, } variant = pcf50633_reg_read(pcf, 1); - if (version < 0) { + if (variant < 0) { dev_err(pcf->dev, "Unable to probe pcf50633\n"); kfree(pcf); return -ENODEV; |