diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /drivers/s390/char/raw3270.h | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 |