diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-08-18 23:49:20 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-18 23:49:20 -0400 |
| commit | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (patch) | |
| tree | e9fc247ed3a26f5369a7ec1b1bd0ef66bda7b4dd /include/linux/regmap.h | |
| parent | eb91626ac4b9af3d5602a7db888b8bc4cb23eb3b (diff) | |
| parent | 63b66e5ba54b15a6592be00555d762db6db739ce (diff) | |
Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel
* tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel: (153 commits)
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 75981d0b57dc..580a5320cc96 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/rbtree.h> | 17 | #include <linux/rbtree.h> |
| 18 | #include <linux/err.h> | ||
| 18 | 19 | ||
| 19 | struct module; | 20 | struct module; |
| 20 | struct device; | 21 | struct device; |