diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 23:59:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 23:59:11 +0200 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/sn/kernel/iomv.c | |
| parent | embedded: fix vc_translate operator precedence (diff) | |
| parent | [IA64] Move include/asm-ia64 to arch/ia64/include/asm (diff) | |
| download | linux-2b12a4c524812fb3f6ee590a02e65b95c8c32229.tar.xz linux-2b12a4c524812fb3f6ee590a02e65b95c8c32229.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/sn/kernel/iomv.c')
| -rw-r--r-- | arch/ia64/sn/kernel/iomv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c index ab7e2fd40798..c77ebdf98119 100644 --- a/arch/ia64/sn/kernel/iomv.c +++ b/arch/ia64/sn/kernel/iomv.c @@ -63,7 +63,7 @@ EXPORT_SYMBOL(sn_io_addr); /** * __sn_mmiowb - I/O space memory barrier * - * See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl + * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl * for details. * * On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear. |