diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2011-05-24 20:13:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:39:57 -0400 |
commit | 545554e7c5bb93bfbf134f9f12889701c0aadf97 (patch) | |
tree | c3537ce091304a5364ec1a65eac01980d14486a9 /drivers/gpio/ml_ioh_gpio.c | |
parent | c5e7043ef784be323750ea4cfdfe004f71c02566 (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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/ml_ioh_gpio.c b/drivers/gpio/ml_ioh_gpio.c index 0a775f7987c2..1bc621ac3536 100644 --- a/drivers/gpio/ml_ioh_gpio.c +++ b/drivers/gpio/ml_ioh_gpio.c | |||
@@ -15,6 +15,7 @@ | |||
15 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. | 15 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. |
16 | */ | 16 | */ |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/slab.h> | ||
18 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
19 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
20 | 21 | ||
@@ -138,6 +139,7 @@ static int ioh_gpio_direction_input(struct gpio_chip *gpio, unsigned nr) | |||
138 | return 0; | 139 | return 0; |
139 | } | 140 | } |
140 | 141 | ||
142 | #ifdef CONFIG_PM | ||
141 | /* | 143 | /* |
142 | * Save register configuration and disable interrupts. | 144 | * Save register configuration and disable interrupts. |
143 | */ | 145 | */ |
@@ -157,6 +159,7 @@ static void ioh_gpio_restore_reg_conf(struct ioh_gpio *chip) | |||
157 | /* to store contents of PM register */ | 159 | /* to store contents of PM register */ |
158 | iowrite32(chip->ioh_gpio_reg.pm_reg, &chip->reg->regs[chip->ch].pm); | 160 | iowrite32(chip->ioh_gpio_reg.pm_reg, &chip->reg->regs[chip->ch].pm); |
159 | } | 161 | } |
162 | #endif | ||
160 | 163 | ||
161 | static void ioh_gpio_setup(struct ioh_gpio *chip, int num_port) | 164 | static void ioh_gpio_setup(struct ioh_gpio *chip, int num_port) |
162 | { | 165 | { |