diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /drivers/s390/char/vmwatchdog.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/s390/char/vmwatchdog.c')
| -rw-r--r-- | drivers/s390/char/vmwatchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index 5473c23fcb52..5acc0ace3d7d 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c | |||
| @@ -66,7 +66,7 @@ static int __diag288(enum vmwdt_func func, unsigned int timeout, | |||
| 66 | __cmdl = len; | 66 | __cmdl = len; |
| 67 | err = 0; | 67 | err = 0; |
| 68 | asm volatile ( | 68 | asm volatile ( |
| 69 | #ifdef __s390x__ | 69 | #ifdef CONFIG_64BIT |
| 70 | "diag %2,%4,0x288\n" | 70 | "diag %2,%4,0x288\n" |
| 71 | "1: \n" | 71 | "1: \n" |
| 72 | ".section .fixup,\"ax\"\n" | 72 | ".section .fixup,\"ax\"\n" |