Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / Makefile

diff --git a/drivers/media/video/gspca/Makefile b/drivers/media/video/gspca/Makefile
index e68a8965297a70d7cff5ba6fb33ea83a32d4ee96..22734f5a6c3216b52cd0fb867832da939ced7bf6 100644 (file)
--- a/drivers/media/video/gspca/Makefile
+++ b/drivers/media/video/gspca/Makefile
@@ -1,29 +1,48 @@
-obj-$(CONFIG_USB_GSPCA)        += gspca_main.o \
-       gspca_conex.o gspca_etoms.o gspca_mars.o \
-       gspca_ov519.o gspca_pac207.o gspca_pac7311.o \
-       gspca_sonixb.o gspca_sonixj.o gspca_spca500.o gspca_spca501.o \
-       gspca_spca505.o gspca_spca506.o gspca_spca508.o gspca_spca561.o \
-       gspca_sunplus.o gspca_stk014.o gspca_t613.o gspca_tv8532.o \
-       gspca_vc032x.o gspca_zc3xx.o
+obj-$(CONFIG_USB_GSPCA)                += gspca_main.o
+obj-$(CONFIG_USB_GSPCA_CONEX)  += gspca_conex.o
+obj-$(CONFIG_USB_GSPCA_ETOMS)  += gspca_etoms.o
+obj-$(CONFIG_USB_GSPCA_FINEPIX)        += gspca_finepix.o
+obj-$(CONFIG_USB_GSPCA_MARS)   += gspca_mars.o
+obj-$(CONFIG_USB_GSPCA_OV519)  += gspca_ov519.o
+obj-$(CONFIG_USB_GSPCA_PAC207) += gspca_pac207.o
+obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
+obj-$(CONFIG_USB_GSPCA_SONIXB) += gspca_sonixb.o
+obj-$(CONFIG_USB_GSPCA_SONIXJ) += gspca_sonixj.o
+obj-$(CONFIG_USB_GSPCA_SPCA500) += gspca_spca500.o
+obj-$(CONFIG_USB_GSPCA_SPCA501) += gspca_spca501.o
+obj-$(CONFIG_USB_GSPCA_SPCA505) += gspca_spca505.o
+obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o
+obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o
+obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o
+obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o
+obj-$(CONFIG_USB_GSPCA_STK014) += gspca_stk014.o
+obj-$(CONFIG_USB_GSPCA_T613)   += gspca_t613.o
+obj-$(CONFIG_USB_GSPCA_TV8532) += gspca_tv8532.o
+obj-$(CONFIG_USB_GSPCA_VC032X) += gspca_vc032x.o
+obj-$(CONFIG_USB_GSPCA_ZC3XX)  += gspca_zc3xx.o
+
+gspca_main-objs                        := gspca.o
+gspca_conex-objs               := conex.o
+gspca_etoms-objs               := etoms.o
+gspca_finepix-objs             := finepix.o
+gspca_mars-objs                        := mars.o
+gspca_ov519-objs               := ov519.o
+gspca_pac207-objs              := pac207.o
+gspca_pac7311-objs             := pac7311.o
+gspca_sonixb-objs              := sonixb.o
+gspca_sonixj-objs              := sonixj.o
+gspca_spca500-objs             := spca500.o
+gspca_spca501-objs             := spca501.o
+gspca_spca505-objs             := spca505.o
+gspca_spca506-objs             := spca506.o
+gspca_spca508-objs             := spca508.o
+gspca_spca561-objs             := spca561.o
+gspca_stk014-objs              := stk014.o
+gspca_sunplus-objs             := sunplus.o
+gspca_t613-objs                        := t613.o
+gspca_tv8532-objs              := tv8532.o
+gspca_vc032x-objs              := vc032x.o
+gspca_zc3xx-objs               := zc3xx.o
+
+obj-$(CONFIG_USB_M5602)                += m5602/
 
-gspca_main-objs := gspca.o
-gspca_conex-objs := conex.o
-gspca_etoms-objs := etoms.o
-gspca_mars-objs := mars.o
-gspca_ov519-objs := ov519.o
-gspca_pac207-objs := pac207.o
-gspca_pac7311-objs := pac7311.o
-gspca_sonixb-objs := sonixb.o
-gspca_sonixj-objs := sonixj.o
-gspca_spca500-objs := spca500.o
-gspca_spca501-objs := spca501.o
-gspca_spca505-objs := spca505.o
-gspca_spca506-objs := spca506.o
-gspca_spca508-objs := spca508.o
-gspca_spca561-objs := spca561.o
-gspca_stk014-objs := stk014.o
-gspca_sunplus-objs := sunplus.o
-gspca_t613-objs := t613.o
-gspca_tv8532-objs := tv8532.o
-gspca_vc032x-objs := vc032x.o
-gspca_zc3xx-objs := zc3xx.o