diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /drivers/pnp/card.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'drivers/pnp/card.c')
| -rw-r--r-- | drivers/pnp/card.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 97eeecfaef1b..3252662958d3 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
| @@ -140,7 +140,7 @@ static void pnp_release_card(struct device *dmdev) | |||
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | 142 | ||
| 143 | static ssize_t pnp_show_card_name(struct device *dmdev, char *buf) | 143 | static ssize_t pnp_show_card_name(struct device *dmdev, struct device_attribute *attr, char *buf) |
| 144 | { | 144 | { |
| 145 | char *str = buf; | 145 | char *str = buf; |
| 146 | struct pnp_card *card = to_pnp_card(dmdev); | 146 | struct pnp_card *card = to_pnp_card(dmdev); |
| @@ -150,7 +150,7 @@ static ssize_t pnp_show_card_name(struct device *dmdev, char *buf) | |||
| 150 | 150 | ||
| 151 | static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL); | 151 | static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL); |
| 152 | 152 | ||
| 153 | static ssize_t pnp_show_card_ids(struct device *dmdev, char *buf) | 153 | static ssize_t pnp_show_card_ids(struct device *dmdev, struct device_attribute *attr, char *buf) |
| 154 | { | 154 | { |
| 155 | char *str = buf; | 155 | char *str = buf; |
| 156 | struct pnp_card *card = to_pnp_card(dmdev); | 156 | struct pnp_card *card = to_pnp_card(dmdev); |