diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/s390/char/raw3270.h | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/char/raw3270.h')
| -rw-r--r-- | drivers/s390/char/raw3270.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h index b635bf8e7775..90beaa80a782 100644 --- a/drivers/s390/char/raw3270.h +++ b/drivers/s390/char/raw3270.h | |||
| @@ -231,7 +231,7 @@ alloc_string(struct list_head *free_list, unsigned long len) | |||
| 231 | INIT_LIST_HEAD(&cs->update); | 231 | INIT_LIST_HEAD(&cs->update); |
| 232 | return cs; | 232 | return cs; |
| 233 | } | 233 | } |
| 234 | return 0; | 234 | return NULL; |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | static inline unsigned long | 237 | static inline unsigned long |