diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/s390/cio/device.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/cio/device.c')
| -rw-r--r-- | drivers/s390/cio/device.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 94bdd4d8a4c9..39c98f940507 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
| @@ -532,8 +532,7 @@ device_remove_files(struct device *dev) | |||
| 532 | 532 | ||
| 533 | /* this is a simple abstraction for device_register that sets the | 533 | /* this is a simple abstraction for device_register that sets the |
| 534 | * correct bus type and adds the bus specific files */ | 534 | * correct bus type and adds the bus specific files */ |
| 535 | int | 535 | static int ccw_device_register(struct ccw_device *cdev) |
| 536 | ccw_device_register(struct ccw_device *cdev) | ||
| 537 | { | 536 | { |
| 538 | struct device *dev = &cdev->dev; | 537 | struct device *dev = &cdev->dev; |
| 539 | int ret; | 538 | int ret; |