aboutsummaryrefslogtreecommitdiff
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-08-29 15:48:23 -0700
committerTony Luck <tony.luck@intel.com>2005-08-29 15:48:23 -0700
commitb946ecbb11145ae2f375d2d7289a6e7280462b02 (patch)
tree9a3102c429d4918a6506770e307bb6f725485384 /include/asm-ia64
parent7115c13bd6d166982212276610b27773b8c27aec (diff)
parentf8220c7f15c54aefb4976ad7c6e2aa98b27a8ce8 (diff)
Pull pending-2.6.14 into release branch
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h
index 54e7637a326..a2f92edd717 100644
--- a/include/asm-ia64/io.h
+++ b/include/asm-ia64/io.h
@@ -41,7 +41,7 @@
#define IO_SPACE_BASE(space) ((space) << IO_SPACE_BITS)
#define IO_SPACE_PORT(port) ((port) & (IO_SPACE_SIZE - 1))
-#define IO_SPACE_SPARSE_ENCODING(p) ((((p) >> 2) << 12) | (p & 0xfff))
+#define IO_SPACE_SPARSE_ENCODING(p) ((((p) >> 2) << 12) | ((p) & 0xfff))
struct io_space {
unsigned long mmio_base; /* base in MMIO space */