diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /drivers/pnp/card.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
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); |