diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 10:41:51 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-16 10:41:51 +0100 |
| commit | 3c3dd225819112e56554162c6b37e61a31924e0c (patch) | |
| tree | 5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /drivers/xen/dbgp.c | |
| parent | Revert "OMAPDSS: HDMI: Create platform device for audio support" (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | linux-3c3dd225819112e56554162c6b37e61a31924e0c.tar.xz linux-3c3dd225819112e56554162c6b37e61a31924e0c.zip | |
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
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 @@ static int xen_dbgp_op(struct usb_hcd *hcd, int op) { +#ifdef CONFIG_PCI const struct device *ctrlr = hcd_to_bus(hcd)->controller; +#endif struct physdev_dbgp_op dbgp; if (!xen_initial_domain()) |