diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/h8300/include/asm/io.h | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/h8300/include/asm/io.h')
| -rw-r--r-- | arch/h8300/include/asm/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h index 33e842f3284b..c1a8df22080f 100644 --- a/arch/h8300/include/asm/io.h +++ b/arch/h8300/include/asm/io.h | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | * memory location directly. | 25 | * memory location directly. |
| 26 | */ | 26 | */ |
| 27 | /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates | 27 | /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates |
| 28 | * two accesses to memory, which may be undesireable for some devices. | 28 | * two accesses to memory, which may be undesirable for some devices. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | /* | 31 | /* |