From 361fff778b7c4d2c78f28833415335148d86a1aa Mon Sep 17 00:00:00 2001 From: merge Date: Fri, 5 Dec 2008 09:59:34 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-build-fix-path-to-toolchain-on-1228470136 pending-tracking-hist top was MERGE-via-stable-tracking-build-fix-path-to-toolchain-on-1228470136 / 21b67ab8e79998b0a534263282dab1dda0f11b00 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-build-fix-path-to-toolchain-on stable-tracking-hist top was build-fix-path-to-toolchain-on / ca14ba894df9b28822066c578dde48d7dbe931de ... parent commitmessage: From: Andy Green build-fix-path-to-toolchain-one-at-last.patch Signed-off-by: Andy Green --- include/linux/mfd/pcf50633/core.h | 1 + include/linux/mfd/pcf50633/gpio.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'include/linux') diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index 8c550895a5a..bf107d3794e 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -24,6 +24,7 @@ #include #include #include +#include struct pcf50633; diff --git a/include/linux/mfd/pcf50633/gpio.h b/include/linux/mfd/pcf50633/gpio.h index da74df6d849..6ba3951c54d 100644 --- a/include/linux/mfd/pcf50633/gpio.h +++ b/include/linux/mfd/pcf50633/gpio.h @@ -38,13 +38,13 @@ enum pcf50633_reg_gpocfg { struct pcf50633; -extern void pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, int on); -extern int pcf50633_gpio_get(struct pcf50633 *pcf, int gpio); +void pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, int on); +int pcf50633_gpio_get(struct pcf50633 *pcf, int gpio); -extern void pcf50633_gpio_invert_set(struct pcf50633 *, int gpio, int invert); -extern int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio); +void pcf50633_gpio_invert_set(struct pcf50633 *, int gpio, int invert); +int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio); -extern void pcf50633_gpio_power_supply_set(struct pcf50633 *, +void pcf50633_gpio_power_supply_set(struct pcf50633 *, int gpio, int regulator, int on); #endif /* __LINUX_MFD_PCF50633_GPIO_H */ -- cgit v1.2.3