diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /include/asm-s390/ccwdev.h | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
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 |