diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
| commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
| tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /include/linux/miscdevice.h | |
| parent | 9d8dc3e529a19e427fd379118acd132520935c5d (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
Diffstat (limited to 'include/linux/miscdevice.h')
| -rw-r--r-- | include/linux/miscdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 51e26f3cd3b3..ee80dd7d9f60 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -64,7 +64,7 @@ struct miscdevice { | |||
| 64 | umode_t mode; | 64 | umode_t mode; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | extern int misc_register(struct miscdevice * misc); | 67 | extern int misc_register(struct miscdevice *misc); |
| 68 | extern int misc_deregister(struct miscdevice *misc); | 68 | extern int misc_deregister(struct miscdevice *misc); |
| 69 | 69 | ||
| 70 | #define MODULE_ALIAS_MISCDEV(minor) \ | 70 | #define MODULE_ALIAS_MISCDEV(minor) \ |