diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 00:55:11 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 00:55:11 -0500 |
| commit | 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch) | |
| tree | f23b591e8c6f921c91fce00a6453d4087ec3c071 /drivers/s390/char/vmur.c | |
| parent | 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff) | |
| parent | 193006f7e3b1abd42d7a3677b54fa2996461a842 (diff) | |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'drivers/s390/char/vmur.c')
| -rw-r--r-- | drivers/s390/char/vmur.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c index 1de672f21037..f7e4ae6bf15a 100644 --- a/drivers/s390/char/vmur.c +++ b/drivers/s390/char/vmur.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/cdev.h> | 14 | #include <linux/cdev.h> |
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | #include <linux/smp_lock.h> | ||
| 17 | 16 | ||
| 18 | #include <asm/uaccess.h> | 17 | #include <asm/uaccess.h> |
| 19 | #include <asm/cio.h> | 18 | #include <asm/cio.h> |