Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl

Browse source

* 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <inus.walleij@linaro.org>

...

This commit is contained in:

Arnd Bergmann 2012-07-02 23:03:51 +02:00

parent ca24a14557 5130216265

commit c911a3169e

4 changed files with 503 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/Kconfig

View file

13

arch/arm/mach-prima2/include/mach/gpio.h

View file

2

arch/arm/mach-prima2/include/mach/irqs.h

View file

489

drivers/pinctrl/pinctrl-sirf.c

View file