diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:48:34 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:48:34 -0400 |
| commit | b7ae5056c94a8191c1fd0b5697707377516c0c5d (patch) | |
| tree | 394f68003ea0bc2a0c24e510a7c5b13f479ce743 /drivers/media/video/cx231xx/Makefile | |
| parent | 2126d0a4a205e2d6b763434f892524cd60f74228 (diff) | |
| parent | 6a2a11dbea5db417d200d38dda53c30a2e5603e0 (diff) | |
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
Diffstat (limited to 'drivers/media/video/cx231xx/Makefile')
| -rw-r--r-- | drivers/media/video/cx231xx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile index 755dd0ce65ff..6f2b57384488 100644 --- a/drivers/media/video/cx231xx/Makefile +++ b/drivers/media/video/cx231xx/Makefile | |||
| @@ -11,4 +11,5 @@ EXTRA_CFLAGS += -Idrivers/media/video | |||
| 11 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 11 | EXTRA_CFLAGS += -Idrivers/media/common/tuners |
| 12 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 12 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |
| 13 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 13 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends |
| 14 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb | ||
| 14 | 15 | ||