diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /include/asm-s390/ccwdev.h | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-s390/ccwdev.h')
| -rw-r--r-- | include/asm-s390/ccwdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h index 12456cb2f882..58c70acffc73 100644 --- a/include/asm-s390/ccwdev.h +++ b/include/asm-s390/ccwdev.h | |||
| @@ -63,7 +63,7 @@ ccw_device_id_match(const struct ccw_device_id *array, | |||
| 63 | return id; | 63 | return id; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | return 0; | 66 | return NULL; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | /* The struct ccw device is our replacement for the globally accessible | 69 | /* The struct ccw device is our replacement for the globally accessible |