From 6d2c293d6578048e7b71e0c44897144f15f350ae Mon Sep 17 00:00:00 2001 From: merging other branches Date: Wed, 26 Nov 2008 16:07:01 +0000 Subject: 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 --- drivers/mfd/pcf50633-adc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/mfd/pcf50633-adc.c') diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c index 39bdbae67da..ebd3792e778 100644 --- a/drivers/mfd/pcf50633-adc.c +++ b/drivers/mfd/pcf50633-adc.c @@ -5,7 +5,7 @@ * All rights reserved. * * Broken down from monstrous PCF50633 driver mainly by - * Harald Welte and Andy Green + * Harald Welte, Andy Green and Werner Almesberger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -133,7 +133,7 @@ int pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg) return result; } -EXPORT_SYMBOL(pcf50633_adc_sync_read); +EXPORT_SYMBOL_GPL(pcf50633_adc_sync_read); int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, void (*callback)(struct pcf50633 *, void *, int), @@ -155,7 +155,7 @@ int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, return 0; } -EXPORT_SYMBOL(pcf50633_adc_async_read); +EXPORT_SYMBOL_GPL(pcf50633_adc_async_read); static int adc_result(struct pcf50633 *pcf) { -- cgit v1.2.3