summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-09-21 11:22:09 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-09-21 11:22:09 +0200
commit91f79b30cd7ddf6b54ebaf506424bf6d6f9c102b (patch)
treed9b784b95a6f50f2ea27631a1a4b6c63860a7bd3
parent4ae49cfd28db49f1d199ea50fd83239a42721a0c (diff)
parent7f68c00d0201efb725ae5e959d63105168ce82ea (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--mk/modules.mk4
-rw-r--r--target/linux/config/Config.in.multimedia6
2 files changed, 10 insertions, 0 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 0288222c9..d722fde19 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1166,6 +1166,10 @@ $(eval $(call KMOD_template,USB_GSPCA_PAC207,usb-gspca-pac207,\
$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac207 \
,80))
+$(eval $(call KMOD_template,USB_GSPCA_PAC7311,usb-gspca-pac7311,\
+ $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac7311 \
+,80))
+
$(eval $(call KMOD_template,USB_GSPCA_SPCA561,usb-gspca-spca561,\
$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_spca561 \
,80))
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index e8986ad86..92d1997c4 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -169,6 +169,12 @@ config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207
depends on ADK_KPACKAGE_KMOD_USB_GSPCA
help
+config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311
+ prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver"
+ tristate
+ depends on ADK_KPACKAGE_KMOD_USB_GSPCA
+ help
+
config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561
prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver"
tristate