diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-25 16:06:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-25 16:06:48 +1000 |
| commit | 3054f0e1c049aa147a6d87d6b14c88cce5f56626 (patch) | |
| tree | ad7a577e6d22a8fd5a3ded756a7e812a773fb97a /drivers/s390 | |
| parent | 2b28e11f827dee9bbdabb1673330200e10970ed7 (diff) | |
| parent | 20b0a5caaf407ae71585c8b006d264a2739edbe4 (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
drivers/base/class.c
init/main.c
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/css.c | 2 | ||||
| -rw-r--r-- | drivers/s390/cio/device.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/netiucv.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index de571b276649..a01c6587cdc1 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c @@ -264,7 +264,7 @@ static struct attribute_group subch_attr_group = { .attrs = subch_attrs, }; -static struct attribute_group *default_subch_attr_groups[] = { +static const struct attribute_group *default_subch_attr_groups[] = { &subch_attr_group, NULL, }; diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index a50cfa51aa3c..ccaf7c31edbe 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -654,7 +654,7 @@ static struct attribute_group ccwdev_attr_group = { .attrs = ccwdev_attrs, }; -static struct attribute_group *ccwdev_attr_groups[] = { +static const struct attribute_group *ccwdev_attr_groups[] = { &ccwdev_attr_group, NULL, }; diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 544f76b84ab2..6572999f2c6e 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -2160,7 +2160,7 @@ static struct attribute_group netiucv_drv_attr_group = { .attrs = netiucv_drv_attrs, }; -static struct attribute_group *netiucv_drv_attr_groups[] = { +static const struct attribute_group *netiucv_drv_attr_groups[] = { &netiucv_drv_attr_group, NULL, }; |