diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-10-16 00:03:09 +0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-10-16 00:03:09 +0400 |
| commit | fc3718918f13ad72827d62d36ea0f5fb55090644 (patch) | |
| tree | 4f9551256e02d08be37bab137f3d94182a67504c /drivers/serial/mrst_max3110.c | |
| parent | 7bdb0d18bfd381cc5491eb95973ec5604b356c7e (diff) | |
| parent | d4396eafe402b710a8535137b3bf2abe6c059a15 (diff) | |
| download | linux-fc3718918f13ad72827d62d36ea0f5fb55090644.tar.xz | |
Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ocfs2.h
Diffstat (limited to 'drivers/serial/mrst_max3110.c')
| -rw-r--r-- | drivers/serial/mrst_max3110.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |