diff options
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/pm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 856c681ebbbc..f6ecdd3a2478 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
@@ -38,7 +38,7 @@ config MACH_OMAP_H2 | |||
38 | config MACH_OMAP_H3 | 38 | config MACH_OMAP_H3 |
39 | bool "TI H3 Support" | 39 | bool "TI H3 Support" |
40 | depends on ARCH_OMAP1 && ARCH_OMAP16XX | 40 | depends on ARCH_OMAP1 && ARCH_OMAP16XX |
41 | select GPIOEXPANDER_OMAP | 41 | # select GPIOEXPANDER_OMAP |
42 | help | 42 | help |
43 | TI OMAP 1710 H3 board support. Say Y here if you have such | 43 | TI OMAP 1710 H3 board support. Say Y here if you have such |
44 | a board. | 44 | a board. |
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 7d0cf7af88ce..e7130293a03f 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -385,7 +385,7 @@ static void __init osk_init(void) | |||
385 | /* Workaround for wrong CS3 (NOR flash) timing | 385 | /* Workaround for wrong CS3 (NOR flash) timing |
386 | * There are some U-Boot versions out there which configure | 386 | * There are some U-Boot versions out there which configure |
387 | * wrong CS3 memory timings. This mainly leads to CRC | 387 | * wrong CS3 memory timings. This mainly leads to CRC |
388 | * or similiar errors if you use NOR flash (e.g. with JFFS2) | 388 | * or similar errors if you use NOR flash (e.g. with JFFS2) |
389 | */ | 389 | */ |
390 | if (EMIFS_CCS(3) != EMIFS_CS3_VAL) | 390 | if (EMIFS_CCS(3) != EMIFS_CS3_VAL) |
391 | EMIFS_CCS(3) = EMIFS_CS3_VAL; | 391 | EMIFS_CCS(3) = EMIFS_CS3_VAL; |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 4bc8a62909b9..015824185629 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * Original version : Laurent Gonzalez | 8 | * Original version : Laurent Gonzalez |
9 | * | 9 | * |
10 | * Maintainters : http://palmtelinux.sf.net | 10 | * Maintainers : http://palmtelinux.sf.net |
11 | * palmtelinux-developpers@lists.sf.net | 11 | * palmtelinux-developpers@lists.sf.net |
12 | * | 12 | * |
13 | * This program is free software; you can redistribute it and/or modify | 13 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 8caee68aa090..5bb348e2e315 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -438,7 +438,7 @@ void omap_pm_suspend(void) | |||
438 | omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG); | 438 | omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG); |
439 | 439 | ||
440 | /* | 440 | /* |
441 | * Reenable interrupts | 441 | * Re-enable interrupts |
442 | */ | 442 | */ |
443 | 443 | ||
444 | local_irq_enable(); | 444 | local_irq_enable(); |