diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-03 05:28:58 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-03 05:28:58 +0200 |
| commit | df2071bd081408318d659cd14a9cf6ff23d874c9 (patch) | |
| tree | b31291b5fd4b9f84c629833afbfaa8d431857475 /drivers/serial/ioc3_serial.c | |
| parent | padata: Dont scale the parallel objects with the cpus (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff) | |
| download | linux-df2071bd081408318d659cd14a9cf6ff23d874c9.tar.xz linux-df2071bd081408318d659cd14a9cf6ff23d874c9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/ioc3_serial.c')
| -rw-r--r-- | drivers/serial/ioc3_serial.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 23ba6b40b3ac..f164ba4eba02 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c @@ -20,6 +20,7 @@ #include <linux/pci.h> #include <linux/serial_core.h> #include <linux/ioc3.h> +#include <linux/slab.h> /* * Interesting things about the ioc3 |