git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-omap2
/
board-omap3touchbook.c
diff --git
a/arch/arm/mach-omap2/board-omap3touchbook.c
b/arch/arm/mach-omap2/board-omap3touchbook.c
index
3943d0f
..
2f5f823
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/
arch/arm/mach-omap2/board-omap3touchbook.c
@@
-328,8
+328,7
@@
static void __init omap3_ads7846_init(void)
}
gpio_direction_input(OMAP3_TS_GPIO);
}
gpio_direction_input(OMAP3_TS_GPIO);
- omap_set_gpio_debounce(OMAP3_TS_GPIO, 1);
- omap_set_gpio_debounce_time(OMAP3_TS_GPIO, 0xa);
+ gpio_set_debounce(OMAP3_TS_GPIO, 310);
}
static struct ads7846_platform_data ads7846_config = {
}
static struct ads7846_platform_data ads7846_config = {
@@
-493,7
+492,7
@@
static void __init omap3touchbook_flash_init(void)
}
}
}
}
-static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+static
const
struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
@@
-518,14
+517,14
@@
static void omap3_touchbook_poweroff(void)
gpio_direction_output(TB_KILL_POWER_GPIO, 0);
}
gpio_direction_output(TB_KILL_POWER_GPIO, 0);
}
-static
void __init early_touchbook_revision(char *
*p)
+static
int __init early_touchbook_revision(char
*p)
{
{
- if (!
*
p)
- return;
+ if (!p)
+ return
0
;
-
strict_strtoul(*
p, 10, &touchbook_revision);
+
return strict_strtoul(
p, 10, &touchbook_revision);
}
}
-
__early_param("tbr=
", early_touchbook_revision);
+
early_param("tbr
", early_touchbook_revision);
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,
static struct omap_musb_board_data musb_board_data = {
.interface_type = MUSB_INTERFACE_ULPI,