Merge refs/heads/for-mainline from nokia

8a43a859 · Tony Lindgren · 11831a10 · 7628f330 · 8a43a859 · 8a43a859
Commit 8a43a859 authored Aug 29, 2005 by Tony Lindgren
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

arch/arm/mach-omap2/io.c arch/arm/mach-omap2/io.c +1 -1

arch/arm/mach-omap2/timer-gp.c arch/arm/mach-omap2/timer-gp.c +2 -2

No files found.
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
 /*
- * linux/arch/arm/mach-omap/omap1/io.c
+ * linux/arch/arm/mach-omap2/io.c
 *
 * OMAP2 I/O mapping code
 *

--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
 /*
- * linux/arch/arm/mach-omap/omap2/timer-mpu.c
+ * linux/arch/arm/mach-omap2/timer-gp.c
 *
- * OMAP2 MPU timer support.
+ * OMAP2 GP timer support.
 *
 * Copyright (C) 2005 Nokia Corporation
 * Author: Paul Mundt <paul.mundt@nokia.com>