From 4a922dc8ab2915b61ff6adfe8e0a01069893b52b Mon Sep 17 00:00:00 2001 From: Andy Green Date: Fri, 21 Nov 2008 16:40:58 +0000 Subject: MERGE-via-balaji-tracking-balaji-updates Signed-off-by: Andy Green --- include/linux/mfd/pcf50633/adc.h | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'include/linux/mfd/pcf50633/adc.h') diff --git a/include/linux/mfd/pcf50633/adc.h b/include/linux/mfd/pcf50633/adc.h index 54246e72bcc..27eabb21683 100644 --- a/include/linux/mfd/pcf50633/adc.h +++ b/include/linux/mfd/pcf50633/adc.h @@ -1,3 +1,15 @@ +/* + * adc.h -- Driver for NXP PCF50633 ADC + * + * (C) 2006-2008 by Openmoko, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + #ifndef __LINUX_MFD_PCF50633_ADC_H #define __LINUX_MFD_PCF50633_ADC_H @@ -66,27 +78,11 @@ struct pcf50633_adc { struct mutex queue_mutex; }; -#ifdef CONFIG_MFD_PCF50633_ADC extern int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, void (*callback)(struct pcf50633 *, void *, int), void *callback_param); extern int pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg); -#else -int -pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, - void (*callback)(struct pcf50633 *, void *, int), - void *callback_param) -{ - return -ENODEV; -} - -int -pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg) -{ - return -ENODEV; -} -#endif /* CONFIG_PCF50633_ADC */ #endif /* __LINUX_PCF50633_ADC_H */ -- cgit v1.2.3