diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/h8300/include/asm/io.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 | /* |