diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/s390/cio/qdio_debug.c | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/s390/cio/qdio_debug.c')
| -rw-r--r-- | drivers/s390/cio/qdio_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c index 337aa3087a78..b5390821434f 100644 --- a/drivers/s390/cio/qdio_debug.c +++ b/drivers/s390/cio/qdio_debug.c | |||
| @@ -155,7 +155,7 @@ static int qstat_seq_open(struct inode *inode, struct file *filp) | |||
| 155 | static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name) | 155 | static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name) |
| 156 | { | 156 | { |
| 157 | memset(name, 0, sizeof(name)); | 157 | memset(name, 0, sizeof(name)); |
| 158 | sprintf(name, "%s", cdev->dev.bus_id); | 158 | sprintf(name, "%s", dev_name(&cdev->dev)); |
| 159 | if (q->is_input_q) | 159 | if (q->is_input_q) |
| 160 | sprintf(name + strlen(name), "_input"); | 160 | sprintf(name + strlen(name), "_input"); |
| 161 | else | 161 | else |