diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
| commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
| tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /drivers/s390/cio/qdio.c | |
| parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
| parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) | |
Merge HEAD from ../from-linus
Diffstat (limited to 'drivers/s390/cio/qdio.c')
| -rw-r--r-- | drivers/s390/cio/qdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index d36258d6665f..533f90c05cdf 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
| @@ -230,7 +230,7 @@ qdio_siga_input(struct qdio_q *q) | |||
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | /* locked by the locks in qdio_activate and qdio_cleanup */ | 232 | /* locked by the locks in qdio_activate and qdio_cleanup */ |
| 233 | static __u32 * volatile | 233 | static __u32 volatile * |
| 234 | qdio_get_indicator(void) | 234 | qdio_get_indicator(void) |
| 235 | { | 235 | { |
| 236 | int i; | 236 | int i; |