diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-09 17:40:37 +0700 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-09 17:40:37 +0700 |
| commit | 0bae2f17323a4630c487a9b77c37bebf407424af (patch) | |
| tree | fc1f71a0209ec61841a5acb65d59d147af3cc4fa /drivers/s390/cio/chp.h | |
| parent | adf32eaa05323449b74b36f25b918583e2bdb6f1 (diff) | |
| parent | ca801a22f465eae39fadc770e15b5b7e82595f81 (diff) | |
| download | talos-obmc-linux-0bae2f17323a4630c487a9b77c37bebf407424af.tar.gz talos-obmc-linux-0bae2f17323a4630c487a9b77c37bebf407424af.zip | |
Merge branch 'ib-mfd-regulator-gpio-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
Diffstat (limited to 'drivers/s390/cio/chp.h')
| -rw-r--r-- | drivers/s390/cio/chp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h index 4efd5b867cc3..af0232290dc4 100644 --- a/drivers/s390/cio/chp.h +++ b/drivers/s390/cio/chp.h @@ -48,7 +48,7 @@ struct channel_path { /* Channel-measurement related stuff: */ int cmg; int shared; - void *cmg_chars; + struct cmg_chars cmg_chars; }; /* Return channel_path struct for given chpid. */ |
