diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:54:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:54:16 -0700 |
| commit | 9f6ac7850a9c6363f4117fd2248e232a2d534627 (patch) | |
| tree | 7eac24b3b406f0bc9cb06eb8fe7cd19254275cba /drivers/staging | |
| parent | Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 (diff) | |
| parent | V4L/DVB (13039): dib0700: not building CONFIG_DVB_TUNER_DIB0070 breaks compilation (diff) | |
| download | linux-dev-9f6ac7850a9c6363f4117fd2248e232a2d534627.tar.xz linux-dev-9f6ac7850a9c6363f4117fd2248e232a2d534627.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (13039): dib0700: not building CONFIG_DVB_TUNER_DIB0070 breaks compilation
V4L/DVB (13038): dvbdev: Remove an anoying/uneeded warning
V4L/DVB (13037): go7007: Revert compatibility code added at the wrong place
media: video: Fix build in saa7164
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/go7007/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/go7007/Makefile b/drivers/staging/go7007/Makefile index d14ea84a01f6..1301caa7495d 100644 --- a/drivers/staging/go7007/Makefile +++ b/drivers/staging/go7007/Makefile @@ -32,8 +32,3 @@ endif EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core - -# Ubuntu 8.04 has CONFIG_SND undefined, so include lum sound/config.h too -ifeq ($(CONFIG_SND),) -EXTRA_CFLAGS += -include sound/config.h -endif |