From 7374ca388be6d2bb513e5812ed35263282c70e46 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 24 Sep 2005 13:49:37 -0700
Subject: [PATCH] --- yaml --- r: 9291 b: refs/heads/master c:
 2e55b57a6000ff05f6aadcddf204ecb42749a332 h: refs/heads/master i:   9289:
 79fa55131db9342cb255922b3e1e5b92eaef5bcc   9287:
 03d25e518f2b625da708f1190894db5adb9512c2 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/io.c  | 6 +++---
 trunk/drivers/input/input.c | 1 +
 trunk/include/asm-arm/io.h  | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 15cdbf4b0bb6..eb449647d21e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f993724210744a9b07cf5496808828c4da6ab6df
+refs/heads/master: 2e55b57a6000ff05f6aadcddf204ecb42749a332
diff --git a/trunk/arch/arm/kernel/io.c b/trunk/arch/arm/kernel/io.c
index 6c20c1188b60..1f6822dfae74 100644
--- a/trunk/arch/arm/kernel/io.c
+++ b/trunk/arch/arm/kernel/io.c
@@ -7,7 +7,7 @@
  * Copy data from IO memory space to "real" memory space.
  * This needs to be optimized.
  */
-void _memcpy_fromio(void *to, void __iomem *from, size_t count)
+void _memcpy_fromio(void *to, const volatile void __iomem *from, size_t count)
 {
 	unsigned char *t = to;
 	while (count) {
@@ -22,7 +22,7 @@ void _memcpy_fromio(void *to, void __iomem *from, size_t count)
  * Copy data from "real" memory space to IO memory space.
  * This needs to be optimized.
  */
-void _memcpy_toio(void __iomem *to, const void *from, size_t count)
+void _memcpy_toio(volatile void __iomem *to, const void *from, size_t count)
 {
 	const unsigned char *f = from;
 	while (count) {
@@ -37,7 +37,7 @@ void _memcpy_toio(void __iomem *to, const void *from, size_t count)
  * "memset" on IO memory space.
  * This needs to be optimized.
  */
-void _memset_io(void __iomem *dst, int c, size_t count)
+void _memset_io(volatile void __iomem *dst, int c, size_t count)
 {
 	while (count) {
 		count--;
diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c
index 88636a204525..14ae5583e198 100644
--- a/trunk/drivers/input/input.c
+++ b/trunk/drivers/input/input.c
@@ -308,6 +308,7 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
 		MATCH_BIT(ledbit, LED_MAX);
 		MATCH_BIT(sndbit, SND_MAX);
 		MATCH_BIT(ffbit,  FF_MAX);
+		MATCH_BIT(swbit,  SW_MAX);
 
 		return id;
 	}
diff --git a/trunk/include/asm-arm/io.h b/trunk/include/asm-arm/io.h
index cfa71a0dffb6..5c4ae8f5dbb0 100644
--- a/trunk/include/asm-arm/io.h
+++ b/trunk/include/asm-arm/io.h
@@ -136,9 +136,9 @@ extern void __readwrite_bug(const char *fn);
 /*
  * String version of IO memory access ops:
  */
-extern void _memcpy_fromio(void *, void __iomem *, size_t);
-extern void _memcpy_toio(void __iomem *, const void *, size_t);
-extern void _memset_io(void __iomem *, int, size_t);
+extern void _memcpy_fromio(void *, const volatile void __iomem *, size_t);
+extern void _memcpy_toio(volatile void __iomem *, const void *, size_t);
+extern void _memset_io(volatile void __iomem *, int, size_t);
 
 #define mmiowb()