aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpio/ml_ioh_gpio.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2011-05-24 17:13:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 08:39:57 -0700
commit545554e7c5bb93bfbf134f9f12889701c0aadf97 (patch)
treec3537ce091304a5364ec1a65eac01980d14486a9 /drivers/gpio/ml_ioh_gpio.c
parentc5e7043ef784be323750ea4cfdfe004f71c02566 (diff)
drivers/gpio/ml_ioh_gpio.c needs slab.h
alpha allmodconfig: drivers/gpio/ml_ioh_gpio.c: In function 'ioh_gpio_probe': drivers/gpio/ml_ioh_gpio.c:205: error: implicit declaration of function 'kzalloc' drivers/gpio/ml_ioh_gpio.c:205: warning: assignment makes pointer from integer without a cast also fix this: drivers/gpio/ml_ioh_gpio.c:145: warning: 'ioh_gpio_save_reg_conf' defined but not used drivers/gpio/ml_ioh_gpio.c:154: warning: 'ioh_gpio_restore_reg_conf' defined but not used Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpio/ml_ioh_gpio.c')
-rw-r--r--drivers/gpio/ml_ioh_gpio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/ml_ioh_gpio.c b/drivers/gpio/ml_ioh_gpio.c
index 0a775f7987c..1bc621ac353 100644
--- a/drivers/gpio/ml_ioh_gpio.c
+++ b/drivers/gpio/ml_ioh_gpio.c
@@ -15,6 +15,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/gpio.h>
@@ -138,6 +139,7 @@ static int ioh_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
return 0;
}
+#ifdef CONFIG_PM
/*
* Save register configuration and disable interrupts.
*/
@@ -157,6 +159,7 @@ static void ioh_gpio_restore_reg_conf(struct ioh_gpio *chip)
/* to store contents of PM register */
iowrite32(chip->ioh_gpio_reg.pm_reg, &chip->reg->regs[chip->ch].pm);
}
+#endif
static void ioh_gpio_setup(struct ioh_gpio *chip, int num_port)
{