diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:34:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:34:09 +0200 |
| commit | 62fa78436e1beb17210df25b38c347ccb44b396b (patch) | |
| tree | 9ebfa63bf46296150d11708fdabd2abbfb163fa5 /include/linux/device.h | |
| parent | ae21f41e1f569b51e69d8822005d72ed5b8c2e7f (diff) | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
| download | cachepc-linux-62fa78436e1beb17210df25b38c347ccb44b396b.tar.gz cachepc-linux-62fa78436e1beb17210df25b38c347ccb44b396b.zip | |
Merge 5.1-rc3 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index b425a7ee04ce..4e6987e11f68 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -49,8 +49,6 @@ struct bus_attribute { ssize_t (*store)(struct bus_type *bus, const char *buf, size_t count); }; -#define BUS_ATTR(_name, _mode, _show, _store) \ - struct bus_attribute bus_attr_##_name = __ATTR(_name, _mode, _show, _store) #define BUS_ATTR_RW(_name) \ struct bus_attribute bus_attr_##_name = __ATTR_RW(_name) #define BUS_ATTR_RO(_name) \ |