diff options
author | Len Brown <len.brown@intel.com> | 2006-01-07 09:50:18 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-07 09:50:18 +0100 |
commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /drivers/s390/block/xpram.c | |
parent | [ACPI] fix pnpacpi regression resulting from ACPICA 20051117 (diff) | |
parent | [ACPI] enable PNPACPI support for resource types used by HP serial ports (diff) | |
download | linux-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.xz linux-ed03f430cdc8c802652467e9097606fedc2c7abc.zip |
Pull pnpacpi into acpica branch
Diffstat (limited to 'drivers/s390/block/xpram.c')
-rw-r--r-- | drivers/s390/block/xpram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index d428c909b8a0..bf3a67c3cc5e 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c @@ -160,7 +160,7 @@ static int xpram_page_in (unsigned long page_addr, unsigned int xpage_index) "0: ipm %0\n" " srl %0,28\n" "1:\n" -#ifndef CONFIG_ARCH_S390X +#ifndef CONFIG_64BIT ".section __ex_table,\"a\"\n" " .align 4\n" " .long 0b,1b\n" @@ -208,7 +208,7 @@ static long xpram_page_out (unsigned long page_addr, unsigned int xpage_index) "0: ipm %0\n" " srl %0,28\n" "1:\n" -#ifndef CONFIG_ARCH_S390X +#ifndef CONFIG_64BIT ".section __ex_table,\"a\"\n" " .align 4\n" " .long 0b,1b\n" |