diff options
| author | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /include/linux/wimax/debug.h | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/wimax/debug.h')
| -rw-r--r-- | include/linux/wimax/debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wimax/debug.h b/include/linux/wimax/debug.h index ba0c49399a83..c703e0340423 100644 --- a/include/linux/wimax/debug.h +++ b/include/linux/wimax/debug.h @@ -178,7 +178,7 @@ void __d_head(char *head, size_t head_size, WARN_ON(1); } else snprintf(head, head_size, "%s %s: ", - dev_driver_string(dev), dev->bus_id); + dev_driver_string(dev), dev_name(dev)); } |