diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:13:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:13:34 -0800 |
| commit | daedd8708fe7707ed651bb1c83162f25c48a947c (patch) | |
| tree | 424e9aaa7d6f686b729257e753e4edf91fecb73c /drivers/xen/pci.c | |
| parent | 6a6662ced4153f6dbcfc40d7225c3cc45416039c (diff) | |
| parent | 6b71c52e7f848e2c9f804e175215e5965ea90d32 (diff) | |
Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: use static initializers in xen-balloon.c
Xen: fix braces and tabs coding style issue in xenbus_probe.c
Xen: fix braces coding style issue in xenbus_probe.h
Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c
Xen: fix braces coding style issue in gntdev.c and grant-table.c
Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c
Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c
Fix up trivial whitespace-conflicts in
drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}
Diffstat (limited to 'drivers/xen/pci.c')
| -rw-r--r-- | drivers/xen/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c index 66057075d6e..b84bf0b6cc3 100644 --- a/drivers/xen/pci.c +++ b/drivers/xen/pci.c @@ -116,7 +116,7 @@ static int xen_add_device(struct device *dev) &manage_pci_ext); } else { struct physdev_manage_pci manage_pci = { - .bus = pci_dev->bus->number, + .bus = pci_dev->bus->number, .devfn = pci_dev->devfn, }; |