Skip to content

Commit

Permalink
drivers/gpio/ml_ioh_gpio.c needs slab.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed May 25, 2011
1 parent c5e7043 commit 545554e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpio/ml_ioh_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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.
*/
Expand All @@ -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)
{
Expand Down

0 comments on commit 545554e

Please sign in to comment.