diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 13:13:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 13:13:25 +0000 |
| commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
| tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /drivers/misc/c2port/c2port-duramar2150.c | |
| parent | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b (diff) | |
| parent | a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61 (diff) | |
| download | linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.bz2 | |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
Diffstat (limited to 'drivers/misc/c2port/c2port-duramar2150.c')
| -rw-r--r-- | drivers/misc/c2port/c2port-duramar2150.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/c2port/c2port-duramar2150.c b/drivers/misc/c2port/c2port-duramar2150.c index 778fc3fdfb9b..5484301d57d9 100644 --- a/drivers/misc/c2port/c2port-duramar2150.c +++ b/drivers/misc/c2port/c2port-duramar2150.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/io.h> +#include <linux/ioport.h> #include <linux/c2port.h> #define DATA_PORT 0x325 |