diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/ide.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index b17974917dbf..46a14229a162 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1514,7 +1514,7 @@ static inline void ide_set_max_pio(ide_drive_t *drive) | |||
| 1514 | 1514 | ||
| 1515 | char *ide_media_string(ide_drive_t *); | 1515 | char *ide_media_string(ide_drive_t *); |
| 1516 | 1516 | ||
| 1517 | extern struct device_attribute ide_dev_attrs[]; | 1517 | extern const struct attribute_group *ide_dev_groups[]; |
| 1518 | extern struct bus_type ide_bus_type; | 1518 | extern struct bus_type ide_bus_type; |
| 1519 | extern struct class *ide_port_class; | 1519 | extern struct class *ide_port_class; |
| 1520 | 1520 | ||