OpenCloudOS-Kernel

Commit Graph

Author	SHA1	Message	Date
Arnd Bergmann	43872fa788	Merge branch 'depends/rmk/gpio' into next/fixes This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de>	2011-10-31 22:44:18 +01:00
Linus Walleij	f55be1bf52	ARM: 7104/1: plat-pxa: break out GPIO driver specifics The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>	2011-10-01 23:45:34 +01:00

Author

SHA1

Message

Date

Arnd Bergmann

43872fa788

Merge branch 'depends/rmk/gpio' into next/fixes

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2011-10-31 22:44:18 +01:00

Linus Walleij

f55be1bf52

ARM: 7104/1: plat-pxa: break out GPIO driver specifics

The <mach/gpio.h> file is included from upper directories
and deal with generic GPIO and gpiolib stuff. Break out the
platform and driver specific defines and functions into its own
header file.

Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2011-10-01 23:45:34 +01:00

2 Commits