diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/char/riscom8.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/char/riscom8.c')
| -rw-r--r-- | drivers/char/riscom8.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c index 217660451237..171711acf5cd 100644 --- a/drivers/char/riscom8.c +++ b/drivers/char/riscom8.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
| 48 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 49 | #include <linux/tty_flip.h> | 49 | #include <linux/tty_flip.h> |
| 50 | #include <linux/smp_lock.h> | ||
| 50 | #include <linux/spinlock.h> | 51 | #include <linux/spinlock.h> |
| 51 | #include <linux/device.h> | 52 | #include <linux/device.h> |
| 52 | 53 | ||