diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /arch/s390/kernel/reipl_diag.c | |
| parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
| parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) | |
| download | kernel_samsung_smdk4412-ed03f430cdc8c802652467e9097606fedc2c7abc.zip kernel_samsung_smdk4412-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.gz kernel_samsung_smdk4412-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.bz2 | |
Pull pnpacpi into acpica branch
Diffstat (limited to 'arch/s390/kernel/reipl_diag.c')
| -rw-r--r-- | arch/s390/kernel/reipl_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/reipl_diag.c b/arch/s390/kernel/reipl_diag.c index 83cb42b..1f33951 100644 --- a/arch/s390/kernel/reipl_diag.c +++ b/arch/s390/kernel/reipl_diag.c @@ -26,7 +26,7 @@ void reipl_diag(void) " st %%r4,%0\n" " st %%r5,%1\n" ".section __ex_table,\"a\"\n" -#ifdef __s390x__ +#ifdef CONFIG_64BIT " .align 8\n" " .quad 0b, 0b\n" #else |