diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/pcmcia/socket_sysfs.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/pcmcia/socket_sysfs.c')
| -rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 1040a6c1a8a4..4a3150a7854c 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
| @@ -341,7 +341,8 @@ static struct bin_attribute pccard_cis_attr = { | |||
| 341 | .write = pccard_store_cis, | 341 | .write = pccard_store_cis, |
| 342 | }; | 342 | }; |
| 343 | 343 | ||
| 344 | static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev) | 344 | static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev, |
| 345 | struct class_interface *class_intf) | ||
| 345 | { | 346 | { |
| 346 | struct class_device_attribute **attr; | 347 | struct class_device_attribute **attr; |
| 347 | int ret = 0; | 348 | int ret = 0; |
| @@ -357,7 +358,8 @@ static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev) | |||
| 357 | return ret; | 358 | return ret; |
| 358 | } | 359 | } |
| 359 | 360 | ||
| 360 | static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev) | 361 | static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev, |
| 362 | struct class_interface *class_intf) | ||
| 361 | { | 363 | { |
| 362 | struct class_device_attribute **attr; | 364 | struct class_device_attribute **attr; |
| 363 | 365 | ||