diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-14 15:52:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-14 15:52:23 -0700 |
| commit | ee87cfbacf73810697ae65af579dc6f193c520f5 (patch) | |
| tree | be389832d60926d5f1c50cd13d08204dfd72ef03 /f2.patch | |
| parent | 0b9b586eb80f4a85b512496ce2d7f389c7271d1c (diff) | |
| download | patches-ee87cfbacf73810697ae65af579dc6f193c520f5.tar.gz | |
updated and new patches
Diffstat (limited to 'f2.patch')
| -rw-r--r-- | f2.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/f2.patch b/f2.patch index 1df7c8d67ff1a0..d8eb2ce1a8b842 100644 --- a/f2.patch +++ b/f2.patch @@ -171,11 +171,11 @@ #define RIO_SET_DID(size, x) (size ? (x & 0xffff) : ((x & 0x000000ff) << 16)) --- a/drivers/scsi/fcoe/fcoe_sysfs.c +++ b/drivers/scsi/fcoe/fcoe_sysfs.c -@@ -553,16 +553,20 @@ struct device_type fcoe_fcf_device_type +@@ -553,16 +553,20 @@ static struct device_type fcoe_fcf_devic .release = fcoe_fcf_device_release, }; --struct bus_attribute fcoe_bus_attr_group[] = { +-static struct bus_attribute fcoe_bus_attr_group[] = { - __ATTR(ctlr_create, S_IWUSR, NULL, fcoe_ctlr_create_store), - __ATTR(ctlr_destroy, S_IWUSR, NULL, fcoe_ctlr_destroy_store), - __ATTR_NULL @@ -189,7 +189,7 @@ }; +ATTRIBUTE_GROUPS(fcoe_bus); - struct bus_type fcoe_bus_type = { + static struct bus_type fcoe_bus_type = { .name = "fcoe", .match = &fcoe_bus_match, - .bus_attrs = fcoe_bus_attr_group, |