diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-17 11:29:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-17 11:29:01 -0400 |
| commit | 50ad5f591bf0d2c877cb3689be01bea9eefdeb2b (patch) | |
| tree | b9979a6649f053fc824f75e4ad65ac22854fd4b4 /arch/s390/hypfs/hypfs_diag.c | |
| parent | daaeb6c93829806221b2ac533330c64f338ebb89 (diff) | |
| parent | f6919eb41127db2e06342efcc2da1eeb4646ec34 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/s390/hypfs/hypfs_diag.c')
| -rw-r--r-- | arch/s390/hypfs/hypfs_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c index 704dd396257b..77df726180ba 100644 --- a/arch/s390/hypfs/hypfs_diag.c +++ b/arch/s390/hypfs/hypfs_diag.c | |||
| @@ -438,7 +438,7 @@ static int diag204_probe(void) | |||
| 438 | } | 438 | } |
| 439 | if (diag204((unsigned long)SUBC_STIB6 | | 439 | if (diag204((unsigned long)SUBC_STIB6 | |
| 440 | (unsigned long)INFO_EXT, pages, buf) >= 0) { | 440 | (unsigned long)INFO_EXT, pages, buf) >= 0) { |
| 441 | diag204_store_sc = SUBC_STIB7; | 441 | diag204_store_sc = SUBC_STIB6; |
| 442 | diag204_info_type = INFO_EXT; | 442 | diag204_info_type = INFO_EXT; |
| 443 | goto out; | 443 | goto out; |
| 444 | } | 444 | } |