diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
| commit | 930352862e9533fecc42c7ed20798a7c9e3aa874 (patch) | |
| tree | f234d6eb69c077f898e375aef30c9550dcf069d7 /drivers/tty/serial/nwpserial.c | |
| parent | b46882b6eb713245916100ac5b58664cd242a08d (diff) | |
| parent | 7bbd03e0143b562ff7d96f7e71c016104020b550 (diff) | |
| download | linux-930352862e9533fecc42c7ed20798a7c9e3aa874.tar.xz | |
Merge branch 'topic/enum-info-cleanup' into for-next
this is a series of patches to just convert the plain info callback
for enum ctl elements to snd_ctl_elem_info(). Also, it includes the
extension of snd_ctl_elem_info(), for catching the unexpected string
cut-off and handling the zero items.
Diffstat (limited to 'drivers/tty/serial/nwpserial.c')
| -rw-r--r-- | drivers/tty/serial/nwpserial.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c index c06366b6bc29..5da7622e88c3 100644 --- a/drivers/tty/serial/nwpserial.c +++ b/drivers/tty/serial/nwpserial.c @@ -22,6 +22,7 @@ #include <linux/of_platform.h> #include <linux/of_device.h> #include <linux/nwpserial.h> +#include <linux/delay.h> #include <asm/prom.h> #include <asm/dcr.h> |