diff options
| author | Russell King | 2009-09-22 21:54:53 +0200 |
|---|---|---|
| committer | Russell King | 2009-09-22 22:01:40 +0200 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/usb/core/sysfs.c | |
| parent | ARM: 5721/1: MMCI enable the use of a regulator (diff) | |
| parent | ARM: 5719/1: [AT91] Fix AC97 breakage (diff) | |
| download | kernel-qcow2-linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.gz kernel-qcow2-linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz kernel-qcow2-linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/usb/core/sysfs.c')
| -rw-r--r-- | drivers/usb/core/sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index b5c72e458943..7ec3041ae79e 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -573,7 +573,7 @@ static struct attribute_group dev_string_attr_grp = { .is_visible = dev_string_attrs_are_visible, }; -struct attribute_group *usb_device_groups[] = { +const struct attribute_group *usb_device_groups[] = { &dev_attr_grp, &dev_string_attr_grp, NULL @@ -799,7 +799,7 @@ static struct attribute_group intf_assoc_attr_grp = { .is_visible = intf_assoc_attrs_are_visible, }; -struct attribute_group *usb_interface_groups[] = { +const struct attribute_group *usb_interface_groups[] = { &intf_attr_grp, &intf_assoc_attr_grp, NULL |