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 branches 'regmap-linus' and 'regmap-interface' into regmap-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-palmz71.c
diff --git
a/arch/arm/mach-omap1/board-palmz71.c
b/arch/arm/mach-omap1/board-palmz71.c
index
d7bbbe7
..
9b0ea48
100644
(file)
--- a/
arch/arm/mach-omap1/board-palmz71.c
+++ b/
arch/arm/mach-omap1/board-palmz71.c
@@
-61,7
+61,7
@@
static void __init
omap_palmz71_init_irq(void)
{
omap1_init_common_hw();
omap_palmz71_init_irq(void)
{
omap1_init_common_hw();
- omap_init_irq();
+ omap
1
_init_irq();
}
static const unsigned int palmz71_keymap[] = {
}
static const unsigned int palmz71_keymap[] = {
@@
-256,12
+256,12
@@
palmz71_powercable(int irq, void *dev_id)
{
if (gpio_get_value(PALMZ71_USBDETECT_GPIO)) {
printk(KERN_INFO "PM: Power cable connected\n");
{
if (gpio_get_value(PALMZ71_USBDETECT_GPIO)) {
printk(KERN_INFO "PM: Power cable connected\n");
- set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
- IRQ_TYPE_EDGE_FALLING);
+
irq_
set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
+
IRQ_TYPE_EDGE_FALLING);
} else {
printk(KERN_INFO "PM: Power cable disconnected\n");
} else {
printk(KERN_INFO "PM: Power cable disconnected\n");
- set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
- IRQ_TYPE_EDGE_RISING);
+
irq_
set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
+
IRQ_TYPE_EDGE_RISING);
}
return IRQ_HANDLED;
}
}
return IRQ_HANDLED;
}
@@
-346,5
+346,5
@@
MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")
.reserve = omap_reserve,
.init_irq = omap_palmz71_init_irq,
.init_machine = omap_palmz71_init,
.reserve = omap_reserve,
.init_irq = omap_palmz71_init_irq,
.init_machine = omap_palmz71_init,
- .timer = &omap_timer,
+ .timer = &omap
1
_timer,
MACHINE_END
MACHINE_END