diff options
| author | James Morris <jmorris@namei.org> | 2009-06-19 08:20:55 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-19 08:20:55 +1000 |
| commit | d905163c5b23f6d8511971e06081a1b525e8a0bd (patch) | |
| tree | f76918c1be802ec068d37763466f5518efdb690e /arch/arm/plat-s3c/gpio.c | |
| parent | 44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff) | |
| parent | 0732f87761dbe417cb6e084b712d07e879e876ef (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/plat-s3c/gpio.c')
| -rw-r--r-- | arch/arm/plat-s3c/gpio.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/gpio.c b/arch/arm/plat-s3c/gpio.c index d71dd6d9ce5c..260fdc6ad685 100644 --- a/arch/arm/plat-s3c/gpio.c +++ b/arch/arm/plat-s3c/gpio.c @@ -16,7 +16,7 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <plat/gpio-core.h> +#include <mach/gpio-core.h> #ifdef CONFIG_S3C_GPIO_TRACK struct s3c_gpio_chip *s3c_gpios[S3C_GPIO_END]; @@ -140,6 +140,15 @@ __init void s3c_gpiolib_add(struct s3c_gpio_chip *chip) if (!gc->get) gc->get = s3c_gpiolib_get; +#ifdef CONFIG_PM + if (chip->pm != NULL) { + if (!chip->pm->save || !chip->pm->resume) + printk(KERN_ERR "gpio: %s has missing PM functions\n", + gc->label); + } else + printk(KERN_ERR "gpio: %s has no PM function\n", gc->label); +#endif + /* gpiochip_add() prints own failure message on error. */ ret = gpiochip_add(gc); if (ret >= 0) |