diff --git a/[refs] b/[refs] index 00f71dd0b135..12659588c5d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38d26b9f577ec63ba64926c45f4ee3805ed2041c +refs/heads/master: b5f3616ba73699d07deee1f244179fae49502052 diff --git a/trunk/include/asm-ia64/io.h b/trunk/include/asm-ia64/io.h index 54e7637a326c..a2f92edd717d 100644 --- a/trunk/include/asm-ia64/io.h +++ b/trunk/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 */