diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-16 03:28:52 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-16 03:38:04 +0200 |
| commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
| tree | 67510cec69e18e55d82bed803428b2a5027d92bb /drivers/usb/gadget/legacy/Makefile | |
| parent | Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-... (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.tar.xz linux-b2efb3f0a1db62aff5e824125785ec6731143b6d.zip | |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
Diffstat (limited to 'drivers/usb/gadget/legacy/Makefile')
| -rw-r--r-- | drivers/usb/gadget/legacy/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile index a11aad5635df..edba2d1ee0f3 100644 --- a/drivers/usb/gadget/legacy/Makefile +++ b/drivers/usb/gadget/legacy/Makefile @@ -2,9 +2,9 @@ # USB gadget drivers # -ccflags-y := -I$(PWD)/drivers/usb/gadget/ -ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/ -ccflags-y += -I$(PWD)/drivers/usb/gadget/function/ +ccflags-y := -Idrivers/usb/gadget/ +ccflags-y += -Idrivers/usb/gadget/udc/ +ccflags-y += -Idrivers/usb/gadget/function/ g_zero-y := zero.o g_audio-y := audio.o |