diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /drivers/base/driver.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/base/driver.c')
| -rw-r--r-- | drivers/base/driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index f367885a7646..90c9fff09ead 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
| @@ -98,7 +98,7 @@ EXPORT_SYMBOL_GPL(driver_find_device); | |||
| 98 | * @attr: driver attribute descriptor. | 98 | * @attr: driver attribute descriptor. |
| 99 | */ | 99 | */ |
| 100 | int driver_create_file(struct device_driver *drv, | 100 | int driver_create_file(struct device_driver *drv, |
| 101 | struct driver_attribute *attr) | 101 | const struct driver_attribute *attr) |
| 102 | { | 102 | { |
| 103 | int error; | 103 | int error; |
| 104 | if (drv) | 104 | if (drv) |
| @@ -115,7 +115,7 @@ EXPORT_SYMBOL_GPL(driver_create_file); | |||
| 115 | * @attr: driver attribute descriptor. | 115 | * @attr: driver attribute descriptor. |
| 116 | */ | 116 | */ |
| 117 | void driver_remove_file(struct device_driver *drv, | 117 | void driver_remove_file(struct device_driver *drv, |
| 118 | struct driver_attribute *attr) | 118 | const struct driver_attribute *attr) |
| 119 | { | 119 | { |
| 120 | if (drv) | 120 | if (drv) |
| 121 | sysfs_remove_file(&drv->p->kobj, &attr->attr); | 121 | sysfs_remove_file(&drv->p->kobj, &attr->attr); |
