From 7705412da148c28c4865ac42e7465a54df7b3f56 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 21 Jul 2007 00:50:31 +0000 Subject: [PATCH] fix kmod-pwc compile SVN-Revision: 8088 --- package/kernel/modules/usb.mk | 4 +- target/linux/generic-2.6/config-2.6.22 | 52 ++++++++++++++++++++---- target/linux/generic-2.6/config-template | 41 ++++++++++++++++++- 3 files changed, 85 insertions(+), 12 deletions(-) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 573398e481..22c1d0b2a3 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -298,10 +298,10 @@ endef $(eval $(call KernelPackage,ueagle-atm)) define KernelPackage/usb-pwc - $(call usbdep,+kmod-videodev) + $(call usbdep,+kmod-videodev @LINUX_2_6) TITLE:=Philips WebCam driver DESCRIPTION:=Kernel modules for supporting Philips WebCam USB devices - KCONFIG:=CONFIG_USB_PWC + KCONFIG:=CONFIG_USB_PWC CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_PWC_DEBUG=n AUTOLOAD:=$(call AutoLoad,70,pwc) endef diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22 index 1eaf9d712a..e498b8e79f 100644 --- a/target/linux/generic-2.6/config-2.6.22 +++ b/target/linux/generic-2.6/config-2.6.22 @@ -426,7 +426,6 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET_AH=m -# CONFIG_INET_DCCP_DIAG is not et CONFIG_INET_DIAG=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -650,9 +649,9 @@ CONFIG_LOCKD_V4=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_LSF is not set # CONFIG_LXT_PHY is not set +CONFIG_MAC80211=m # CONFIG_MAC80211_DEBUG is not set CONFIG_MAC80211_LEDS=y -CONFIG_MAC80211=m # CONFIG_MAC_EMUMOUSEBTN is not set CONFIG_MAC_PARTITION=y # CONFIG_MAGIC_SYSRQ is not set @@ -874,8 +873,8 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m -CONFIG_NO_HZ=y CONFIG_NORTEL_HERMES=m +CONFIG_NO_HZ=y # CONFIG_NS83820 is not set # CONFIG_NTFS_DEBUG is not set # CONFIG_NTFS_FS is not set @@ -935,8 +934,8 @@ CONFIG_PCI=y # CONFIG_PCI_ATMEL is not set CONFIG_PCI_HERMES=m # CONFIG_PCMCIA is not set -# CONFIG_PCMCIA_ATMEL is not set # CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_ATMEL is not set # CONFIG_PCMCIA_DEBUG is not set # CONFIG_PCMCIA_FDOMAIN is not set # CONFIG_PCMCIA_HERMES is not set @@ -1174,10 +1173,10 @@ CONFIG_SIGNALFD=y # CONFIG_SKGE is not set # CONFIG_SKY2 is not set CONFIG_SLAB=y -# CONFIG_SLUB is not set CONFIG_SLHC=m # CONFIG_SLIP is not set # CONFIG_SLOB is not set +# CONFIG_SLUB is not set # CONFIG_SMB_FS is not set # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_SND=m @@ -1336,10 +1335,10 @@ CONFIG_TCP_CONG_HYBLA=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_VEGAS=y CONFIG_TCP_CONG_VENO=m CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_YEAH=m # CONFIG_TCP_MD5SIG is not set CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_BM=m @@ -1357,6 +1356,7 @@ CONFIG_TMPFS=y # CONFIG_TR is not set CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_TUN=m +# CONFIG_TUNER_3036 is not set CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # CONFIG_UFS_FS is not set @@ -1390,21 +1390,22 @@ CONFIG_USB_CATC=m # CONFIG_USB_CYTHERM is not set # CONFIG_USB_DABUSB is not set # CONFIG_USB_DEBUG is not set -# CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DSBR is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_EMI26 is not set # CONFIG_USB_EMI62 is not set # CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_ET61X251 is not set CONFIG_USB_EZUSB=y # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_GADGET is not set CONFIG_USB_HID=m -# CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_USB_IBMCAM is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_ISP116X_HCD is not set @@ -1413,6 +1414,7 @@ CONFIG_USB_KAWETH=m # CONFIG_USB_KBTAB is not set # CONFIG_USB_KC2190 is not set # CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_KONICAWC is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LD is not set # CONFIG_USB_LED is not set @@ -1436,12 +1438,15 @@ CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_OHCI_HCD is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OV511 is not set CONFIG_USB_PEGASUS=m # CONFIG_USB_PHIDGET is not set # CONFIG_USB_POWERMATE is not set CONFIG_USB_PRINTER=m +# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_RTL8150 is not set +# CONFIG_USB_SE401 is not set CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_AIRPRIME=m @@ -1495,6 +1500,7 @@ CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_XIRCOM=m # CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_SN9C102 is not set CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_STORAGE=m CONFIG_USB_STORAGE_ALAUDA=y @@ -1508,43 +1514,71 @@ CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_USBAT=y +# CONFIG_USB_STV680 is not set # CONFIG_USB_TEST is not set # CONFIG_USB_TOUCHSCREEN is not set # CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_UEAGLEATM=m CONFIG_USB_USBNET=m CONFIG_USB_USBNET_MII=m +# CONFIG_USB_VICAM is not set +# CONFIG_USB_W9968CF is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_XUSBATM is not set CONFIG_USB_YEALINK=m +# CONFIG_USB_ZC0301 is not set # CONFIG_USB_ZD1201 is not set +# CONFIG_USB_ZR364XX is not set # CONFIG_UTS_NS is not set CONFIG_VFAT_FS=m # CONFIG_VIA_VELOCITY is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEO_CAFE_CCIC is not set # CONFIG_VIDEO_CAPTURE_DRIVERS is not set +# CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CS53L32A is not set # CONFIG_VIDEO_CX2341X is not set # CONFIG_VIDEO_CX25840 is not set # CONFIG_VIDEO_CX88 is not set CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_DPC is not set +# CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_IVTV is not set +# CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_VIDEO_PMS is not set # CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set # CONFIG_VIDEO_SAA711X is not set # CONFIG_VIDEO_SAA7127 is not set # CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_TDA7432 is not set # CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set # CONFIG_VIDEO_TEA6415C is not set # CONFIG_VIDEO_TEA6420 is not set # CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_TVAUDIO is not set # CONFIG_VIDEO_TVP5150 is not set # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set @@ -1553,8 +1587,10 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_WM8739 is not set # CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_ZORAN is not set # CONFIG_VITESSE_PHY is not set CONFIG_VLAN_8021Q=y # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template index b2d67a6ad1..1b3835dbaf 100644 --- a/target/linux/generic-2.6/config-template +++ b/target/linux/generic-2.6/config-template @@ -915,8 +915,8 @@ CONFIG_PCI=y CONFIG_PCI_ATMEL=m CONFIG_PCI_HERMES=m # CONFIG_PCMCIA is not set -# CONFIG_PCMCIA_ATMEL is not set # CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_ATMEL is not set # CONFIG_PCMCIA_DEBUG is not set # CONFIG_PCMCIA_FDOMAIN is not set # CONFIG_PCMCIA_HERMES is not set @@ -1322,6 +1322,7 @@ CONFIG_TMPFS=y # CONFIG_TR is not set CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_TUN=m +# CONFIG_TUNER_3036 is not set CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # CONFIG_UFS_FS is not set @@ -1361,14 +1362,15 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_EMI62 is not set # CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_ET61X251 is not set CONFIG_USB_EZUSB=y # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_GADGET is not set CONFIG_USB_HID=m -# CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_USB_IBMCAM is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_ISP116X_HCD is not set @@ -1377,6 +1379,7 @@ CONFIG_USB_KAWETH=m # CONFIG_USB_KBTAB is not set # CONFIG_USB_KC2190 is not set # CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_KONICAWC is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LD is not set # CONFIG_USB_LED is not set @@ -1400,12 +1403,15 @@ CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_OHCI_HCD is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_OTG is not set +# CONFIG_USB_OV511 is not set CONFIG_USB_PEGASUS=m # CONFIG_USB_PHIDGET is not set # CONFIG_USB_POWERMATE is not set CONFIG_USB_PRINTER=m +# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_RTL8150 is not set +# CONFIG_USB_SE401 is not set CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_AIRPRIME=m @@ -1459,6 +1465,7 @@ CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_XIRCOM=m # CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_SN9C102 is not set CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_STORAGE=m CONFIG_USB_STORAGE_ALAUDA=y @@ -1472,42 +1479,70 @@ CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_USBAT=y +# CONFIG_USB_STV680 is not set # CONFIG_USB_TEST is not set # CONFIG_USB_TOUCHSCREEN is not set # CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_UEAGLEATM=m CONFIG_USB_USBNET=m CONFIG_USB_USBNET_MII=m +# CONFIG_USB_VICAM is not set +# CONFIG_USB_W9968CF is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_XUSBATM is not set CONFIG_USB_YEALINK=m +# CONFIG_USB_ZC0301 is not set # CONFIG_USB_ZD1201 is not set +# CONFIG_USB_ZR364XX is not set # CONFIG_UTS_NS is not set CONFIG_VFAT_FS=m # CONFIG_VIA_VELOCITY is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEO_CAFE_CCIC is not set +# CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CS53L32A is not set # CONFIG_VIDEO_CX2341X is not set # CONFIG_VIDEO_CX25840 is not set # CONFIG_VIDEO_CX88 is not set CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_DPC is not set +# CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_IVTV is not set +# CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_VIDEO_PMS is not set # CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set # CONFIG_VIDEO_SAA711X is not set # CONFIG_VIDEO_SAA7127 is not set # CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_SAA7191 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_TDA7432 is not set # CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set # CONFIG_VIDEO_TEA6415C is not set # CONFIG_VIDEO_TEA6420 is not set # CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_TVAUDIO is not set # CONFIG_VIDEO_TVP5150 is not set # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set @@ -1516,8 +1551,10 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_WM8739 is not set # CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_ZORAN is not set # CONFIG_VITESSE_PHY is not set CONFIG_VLAN_8021Q=y # CONFIG_VM_EVENT_COUNTERS is not set