diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /drivers/s390/crypto | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'drivers/s390/crypto')
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 6f02f1e674d4..e3fe6838293a 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c | |||
| @@ -892,8 +892,8 @@ static void ap_scan_bus(struct work_struct *unused) | |||
| 892 | 892 | ||
| 893 | ap_dev->device.bus = &ap_bus_type; | 893 | ap_dev->device.bus = &ap_bus_type; |
| 894 | ap_dev->device.parent = ap_root_device; | 894 | ap_dev->device.parent = ap_root_device; |
| 895 | snprintf(ap_dev->device.bus_id, BUS_ID_SIZE, "card%02x", | 895 | dev_set_name(&ap_dev->device, "card%02x", |
| 896 | AP_QID_DEVICE(ap_dev->qid)); | 896 | AP_QID_DEVICE(ap_dev->qid)); |
| 897 | ap_dev->device.release = ap_device_release; | 897 | ap_dev->device.release = ap_device_release; |
| 898 | rc = device_register(&ap_dev->device); | 898 | rc = device_register(&ap_dev->device); |
| 899 | if (rc) { | 899 | if (rc) { |