diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /drivers/char/mwave/3780i.c | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/mwave/3780i.c')
| -rw-r--r-- | drivers/char/mwave/3780i.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c index 613aed9e1840..d1fe05e83882 100644 --- a/drivers/char/mwave/3780i.c +++ b/drivers/char/mwave/3780i.c | |||
| @@ -53,6 +53,8 @@ | |||
| 53 | #include <linux/ioport.h> | 53 | #include <linux/ioport.h> |
| 54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 55 | #include <linux/bitops.h> | 55 | #include <linux/bitops.h> |
| 56 | #include <linux/sched.h> /* cond_resched() */ | ||
| 57 | |||
| 56 | #include <asm/io.h> | 58 | #include <asm/io.h> |
| 57 | #include <asm/uaccess.h> | 59 | #include <asm/uaccess.h> |
| 58 | #include <asm/system.h> | 60 | #include <asm/system.h> |