diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/s390/cio/qdio_main.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/cio/qdio_main.c')
| -rw-r--r-- | drivers/s390/cio/qdio_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index 4f8f74311778..88be7b9ea6e1 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/timer.h> | 14 | #include <linux/timer.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | #include <asm/atomic.h> | 17 | #include <asm/atomic.h> |
| 17 | #include <asm/debug.h> | 18 | #include <asm/debug.h> |
| 18 | #include <asm/qdio.h> | 19 | #include <asm/qdio.h> |