diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /drivers/s390/cio/cmf.c | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/s390/cio/cmf.c')
| -rw-r--r-- | drivers/s390/cio/cmf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index 8cc4f1a940dc..c05b069c2996 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
| @@ -30,10 +30,13 @@ | |||
| 30 | #include <linux/list.h> | 30 | #include <linux/list.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/moduleparam.h> | 32 | #include <linux/moduleparam.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/timex.h> /* get_clock() */ | ||
| 33 | 35 | ||
| 34 | #include <asm/ccwdev.h> | 36 | #include <asm/ccwdev.h> |
| 35 | #include <asm/cio.h> | 37 | #include <asm/cio.h> |
| 36 | #include <asm/cmb.h> | 38 | #include <asm/cmb.h> |
| 39 | #include <asm/div64.h> | ||
| 37 | 40 | ||
| 38 | #include "cio.h" | 41 | #include "cio.h" |
| 39 | #include "css.h" | 42 | #include "css.h" |