diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-19 01:48:34 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-19 01:48:34 +0200 |
| commit | b7ae5056c94a8191c1fd0b5697707377516c0c5d (patch) | |
| tree | 394f68003ea0bc2a0c24e510a7c5b13f479ce743 /drivers/serial/mrst_max3110.c | |
| parent | drm/radeon/kms: make sure blit addr masks are 64 bit (diff) | |
| parent | drm/radeon/kms: avivo cursor workaround applies to evergreen as well (diff) | |
| download | linux-b7ae5056c94a8191c1fd0b5697707377516c0c5d.tar.xz linux-b7ae5056c94a8191c1fd0b5697707377516c0c5d.zip | |
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
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> |