diff options
Diffstat (limited to 'drivers/pnp/interface.c')
| -rw-r--r-- | drivers/pnp/interface.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c index 53fac8ba5d5c..a2d8ce7fef9c 100644 --- a/drivers/pnp/interface.c +++ b/drivers/pnp/interface.c  | |||
| @@ -205,7 +205,7 @@ static void pnp_print_option(pnp_info_buffer_t *buffer, char *space, | |||
| 205 | } | 205 | } | 
| 206 | 206 | ||
| 207 | 207 | ||
| 208 | static ssize_t pnp_show_options(struct device *dmdev, char *buf) | 208 | static ssize_t pnp_show_options(struct device *dmdev, struct device_attribute *attr, char *buf) | 
| 209 | { | 209 | { | 
| 210 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 210 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 
| 211 | struct pnp_option * independent = dev->independent; | 211 | struct pnp_option * independent = dev->independent; | 
| @@ -236,7 +236,7 @@ static ssize_t pnp_show_options(struct device *dmdev, char *buf) | |||
| 236 | static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL); | 236 | static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL); | 
| 237 | 237 | ||
| 238 | 238 | ||
| 239 | static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf) | 239 | static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_attribute *attr, char *buf) | 
| 240 | { | 240 | { | 
| 241 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 241 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 
| 242 | int i, ret; | 242 | int i, ret; | 
| @@ -308,7 +308,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf) | |||
| 308 | extern struct semaphore pnp_res_mutex; | 308 | extern struct semaphore pnp_res_mutex; | 
| 309 | 309 | ||
| 310 | static ssize_t | 310 | static ssize_t | 
| 311 | pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count) | 311 | pnp_set_current_resources(struct device * dmdev, struct device_attribute *attr, const char * ubuf, size_t count) | 
| 312 | { | 312 | { | 
| 313 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 313 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 
| 314 | char *buf = (void *)ubuf; | 314 | char *buf = (void *)ubuf; | 
| @@ -444,7 +444,7 @@ pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count | |||
| 444 | static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR, | 444 | static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR, | 
| 445 | pnp_show_current_resources,pnp_set_current_resources); | 445 | pnp_show_current_resources,pnp_set_current_resources); | 
| 446 | 446 | ||
| 447 | static ssize_t pnp_show_current_ids(struct device *dmdev, char *buf) | 447 | static ssize_t pnp_show_current_ids(struct device *dmdev, struct device_attribute *attr, char *buf) | 
| 448 | { | 448 | { | 
| 449 | char *str = buf; | 449 | char *str = buf; | 
| 450 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 450 | struct pnp_dev *dev = to_pnp_dev(dmdev); | 
