diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 13:02:26 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 13:02:26 +0200 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/s390/block/dasd_ioctl.c | |
| parent | Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and '... (diff) | |
| parent | ARM: 5636/1: Move vendor enum to AMBA include (diff) | |
| download | linux-ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3.tar.xz linux-ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3.zip | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/s390/block/dasd_ioctl.c')
| -rw-r--r-- | drivers/s390/block/dasd_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 4ce3f72ee1c1..df918ef27965 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c @@ -16,6 +16,7 @@ #include <linux/major.h> #include <linux/fs.h> #include <linux/blkpg.h> +#include <linux/smp_lock.h> #include <asm/ccwdev.h> #include <asm/cmb.h> |