diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-07 15:27:23 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-07 15:27:23 -0500 |
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /include/linux/miscdevice.h | |
| parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
| parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'include/linux/miscdevice.h')
| -rw-r--r-- | include/linux/miscdevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index c309b1ecdc1c..c41d7270c6c6 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | #ifndef _LINUX_MISCDEVICE_H | 1 | #ifndef _LINUX_MISCDEVICE_H |
| 2 | #define _LINUX_MISCDEVICE_H | 2 | #define _LINUX_MISCDEVICE_H |
| 3 | #include <linux/module.h> | ||
| 4 | #include <linux/major.h> | 3 | #include <linux/major.h> |
| 4 | #include <linux/list.h> | ||
| 5 | #include <linux/types.h> | ||
| 5 | 6 | ||
| 6 | /* | 7 | /* |
| 7 | * These allocations are managed by device@lanana.org. If you use an | 8 | * These allocations are managed by device@lanana.org. If you use an |