diff options
| author | Colin Cross <ccross@android.com> | 2010-10-15 12:03:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-15 12:03:22 -0700 |
| commit | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (patch) | |
| tree | 214c7beca34ca9fd72493001121599291ea1300d /drivers/serial | |
| parent | 43ca7cdda2e511be7d19c3bdbc437e471b7e8f7e (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
Merge commit 'v2.6.36-rc8' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/mfd.c | 1 | ||||
| -rw-r--r-- | drivers/serial/mrst_max3110.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/mfd.c b/drivers/serial/mfd.c index 324c385a653d..5dff45c76d32 100644 --- a/drivers/serial/mfd.c +++ b/drivers/serial/mfd.c @@ -27,6 +27,7 @@ #include <linux/init.h> #include <linux/console.h> #include <linux/sysrq.h> +#include <linux/slab.h> #include <linux/serial_reg.h> #include <linux/circ_buf.h> #include <linux/delay.h> diff --git a/drivers/serial/mrst_max3110.c b/drivers/serial/mrst_max3110.c index f6ad1ecbff79..51c15f58e01e 100644 --- a/drivers/serial/mrst_max3110.c +++ b/drivers/serial/mrst_max3110.c @@ -29,6 +29,7 @@ #include <linux/module.h> #include <linux/ioport.h> +#include <linux/irq.h> #include <linux/init.h> #include <linux/console.h> #include <linux/sysrq.h> |