diff options
author | Colin Cross <ccross@android.com> | 2010-10-15 12:04:05 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2010-10-15 12:04:05 -0700 |
commit | 9ab3d8b9fcc83cb2eab5cc9834b742d437915a2e (patch) | |
tree | 0a4dc68f031cba95cd36ededfb9b30de60fe1145 /drivers/serial | |
parent | c8b43bb8ec47fc7e75f4474b454d459a22d9f233 (diff) | |
parent | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (diff) |
Merge branch 'linux-tegra-2.6.36' into android-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> |