diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
tree | 639c536e818c6ace974aa285ba94576df0353b01 /drivers/media/video/gspca/stv06xx/Makefile | |
parent | relayfs: replace BUG() with WARN_ON() in relay_late_setup_files() (diff) | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
download | linux-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.xz linux-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.zip |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/media/video/gspca/stv06xx/Makefile')
-rw-r--r-- | drivers/media/video/gspca/stv06xx/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/stv06xx/Makefile b/drivers/media/video/gspca/stv06xx/Makefile new file mode 100644 index 000000000000..feeaa94ab588 --- /dev/null +++ b/drivers/media/video/gspca/stv06xx/Makefile @@ -0,0 +1,9 @@ +obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o + +gspca_stv06xx-objs := stv06xx.o \ + stv06xx_vv6410.o \ + stv06xx_hdcs.o \ + stv06xx_pb0100.o + +EXTRA_CFLAGS += -Idrivers/media/video/gspca + |