diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /drivers/block/z2ram.c | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'drivers/block/z2ram.c')
| -rw-r--r-- | drivers/block/z2ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 2d5853cbd4b0..be20a67f1fa8 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c | |||
| @@ -332,7 +332,7 @@ z2_init(void) | |||
| 332 | int ret; | 332 | int ret; |
| 333 | 333 | ||
| 334 | if (!MACH_IS_AMIGA) | 334 | if (!MACH_IS_AMIGA) |
| 335 | return -ENXIO; | 335 | return -ENODEV; |
| 336 | 336 | ||
| 337 | ret = -EBUSY; | 337 | ret = -EBUSY; |
| 338 | if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) | 338 | if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) |