git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
reset.c
diff --git
a/arch/arm/mach-pxa/reset.c
b/arch/arm/mach-pxa/reset.c
index
df29d45
..
01e9d64
100644
(file)
--- a/
arch/arm/mach-pxa/reset.c
+++ b/
arch/arm/mach-pxa/reset.c
@@
-20,7
+20,7
@@
static void do_hw_reset(void);
static int reset_gpio = -1;
static int reset_gpio = -1;
-int init_gpio_reset(int gpio, int output)
+int init_gpio_reset(int gpio, int output
, int level
)
{
int rc;
{
int rc;
@@
-31,7
+31,7
@@
int init_gpio_reset(int gpio, int output)
}
if (output)
}
if (output)
- rc = gpio_direction_output(gpio,
0
);
+ rc = gpio_direction_output(gpio,
level
);
else
rc = gpio_direction_input(gpio);
if (rc) {
else
rc = gpio_direction_input(gpio);
if (rc) {