diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /drivers/xen/dbgp.c | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'drivers/xen/dbgp.c')
| -rw-r--r-- | drivers/xen/dbgp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/dbgp.c b/drivers/xen/dbgp.c index 42569c77ccc8..f3ccc80a455f 100644 --- a/drivers/xen/dbgp.c +++ b/drivers/xen/dbgp.c | |||
| @@ -8,7 +8,9 @@ | |||
| 8 | 8 | ||
| 9 | static int xen_dbgp_op(struct usb_hcd *hcd, int op) | 9 | static int xen_dbgp_op(struct usb_hcd *hcd, int op) |
| 10 | { | 10 | { |
| 11 | #ifdef CONFIG_PCI | ||
| 11 | const struct device *ctrlr = hcd_to_bus(hcd)->controller; | 12 | const struct device *ctrlr = hcd_to_bus(hcd)->controller; |
| 13 | #endif | ||
| 12 | struct physdev_dbgp_op dbgp; | 14 | struct physdev_dbgp_op dbgp; |
| 13 | 15 | ||
| 14 | if (!xen_initial_domain()) | 16 | if (!xen_initial_domain()) |