diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:20:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:20:11 -0400 |
| commit | 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 (patch) | |
| tree | 93323b1f7146aefb1843cb995def6c09613bb363 /drivers/s390/cio/css.c | |
| parent | 6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e (diff) | |
| parent | 75e9de18f079a51fa987ef0703112d5bc125fdb7 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] stacktrace bug.
[S390] cio: remove casts from/to (void *).
[S390] cio: Remove grace period for vary off chpid.
[S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private
[S390] monwriter kzalloc size.
[S390] cio: add missing KERN_INFO printk header.
[S390] irq change improvements.
Diffstat (limited to 'drivers/s390/cio/css.c')
| -rw-r--r-- | drivers/s390/cio/css.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 7086a74e9871..a2dee5bf5a17 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
| @@ -177,7 +177,7 @@ get_subchannel_by_schid(struct subchannel_id schid) | |||
| 177 | struct device *dev; | 177 | struct device *dev; |
| 178 | 178 | ||
| 179 | dev = bus_find_device(&css_bus_type, NULL, | 179 | dev = bus_find_device(&css_bus_type, NULL, |
| 180 | (void *)&schid, check_subchannel); | 180 | &schid, check_subchannel); |
| 181 | 181 | ||
| 182 | return dev ? to_subchannel(dev) : NULL; | 182 | return dev ? to_subchannel(dev) : NULL; |
| 183 | } | 183 | } |