Changeset 27010


Ignore:
Timestamp:
2011-05-25T21:51:40+02:00 (7 years ago)
Author:
hauke
Message:

kernel: generic: Update 2.6.39 to final

  • Add missing config symbols
  • Update package/kernel for 2.6.39

CONFIG_BT_L2CAP=y and CONFIG_BT_SCO=y are set to build them into the bluetooth module.

Thank you Jonas Gorski for the patch

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/netsupport.mk

    r26900 r27010  
    478478  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    479479  TITLE:=PPtP support 
    480   DEPENDS:=kmod-ppp +kmod-gre @LINUX_2_6_37||LINUX_2_6_38 
     480  DEPENDS:=kmod-ppp +kmod-gre @LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39 
    481481  KCONFIG:=CONFIG_PPTP 
    482482  FILES:=$(LINUX_DIR)/drivers/net/pptp.ko 
     
    490490  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    491491  TITLE:=PPPoL2TP support 
    492   DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-l2tp 
     492  DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39:kmod-l2tp 
    493493  KCONFIG:=CONFIG_PPPOL2TP 
    494   ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37)$(CONFIG_LINUX_2_6_38),) 
     494  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) 
    495495    FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko 
    496496    AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp) 
     
    653653define KernelPackage/l2tp 
    654654  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    655   DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38 
     655  DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39 
    656656  TITLE:=Layer Two Tunneling Protocol (L2TP) 
    657657  KCONFIG:=CONFIG_L2TP \ 
  • trunk/package/kernel/modules/other.mk

    r26900 r27010  
    3939  FILES:= \ 
    4040        $(LINUX_DIR)/net/bluetooth/bluetooth.ko \ 
    41         $(LINUX_DIR)/net/bluetooth/l2cap.ko \ 
    42         $(LINUX_DIR)/net/bluetooth/sco.ko \ 
    4341        $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.ko \ 
    4442        $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ 
     
    4644        $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ 
    4745        $(LINUX_DIR)/drivers/bluetooth/btusb.ko 
    48   AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) 
     46  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.39)),1) 
     47    AUTOLOAD:=$(call AutoLoad,90,bluetooth rfcomm bnep hidp hci_uart btusb) 
     48  else 
     49    FILES+= \ 
     50        $(LINUX_DIR)/net/bluetooth/l2cap.ko \ 
     51        $(LINUX_DIR)/net/bluetooth/sco.ko 
     52    AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) 
     53  endif 
    4954endef 
    5055 
  • trunk/package/kernel/modules/usb.mk

    r26900 r27010  
    547547define KernelPackage/usb-serial-wwan 
    548548  TITLE:=Support for GSM and CDMA modems 
    549   DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38 
     549  DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39 
    550550  KCONFIG:=CONFIG_USB_SERIAL_WWAN 
    551551  FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko 
     
    563563define KernelPackage/usb-serial-option 
    564564  TITLE:=Support for Option HSDPA modems 
    565   DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-usb-serial-wwan 
     565  DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39:kmod-usb-serial-wwan 
    566566  KCONFIG:=CONFIG_USB_SERIAL_OPTION 
    567567  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko 
  • trunk/package/kernel/modules/virtual.mk

    r26900 r27010  
    167167  SUBMENU:=$(VIRTUAL_MENU) 
    168168  TITLE:=Xen PCI device frontend 
    169   DEPENDS:=@TARGET_x86_xen_domu @LINUX_2_6_37||LINUX_2_6_38 
     169  DEPENDS:=@TARGET_x86_xen_domu @LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39 
    170170  KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND 
    171171  FILES:=$(LINUX_DIR)/drivers/xen/platform-pci.ko 
  • trunk/target/linux/generic/config-2.6.39

    r27009 r27010  
    2929# CONFIG_ALCHEMY_GPIO_INDIRECT is not set 
    3030# CONFIG_ALIM7101_WDT is not set 
     31# CONFIG_ALTERA_STAPL is not set 
    3132# CONFIG_AMD8111_ETH is not set 
    3233# CONFIG_AMIGA_PARTITION is not set 
     
    323324# CONFIG_BT_HCIVHCI is not set 
    324325# CONFIG_BT_HIDP is not set 
    325 # CONFIG_BT_L2CAP is not set 
     326CONFIG_BT_L2CAP=y 
    326327# CONFIG_BT_MRVL is not set 
    327328# CONFIG_BT_RFCOMM is not set 
    328329CONFIG_BT_RFCOMM_TTY=y 
    329 # CONFIG_BT_SCO is not set 
     330CONFIG_BT_SCO=y 
    330331CONFIG_BUG=y 
    331332# CONFIG_C2PORT is not set 
     
    553554# CONFIG_DM_LOG_USERSPACE is not set 
    554555# CONFIG_DM_RAID is not set 
     556# CONFIG_DM_FLAKEY is not set 
    555557# CONFIG_DNET is not set 
    556558# CONFIG_DNOTIFY is not set 
     
    780782# CONFIG_HID_GYRATION is not set 
    781783# CONFIG_HID_KENSINGTON is not set 
     784# CONFIG_HID_KEYTOUCH is not set 
    782785# CONFIG_HID_KYE is not set 
     786# CONFIG_HID_LCPOWER is not set 
    783787# CONFIG_HID_LOGITECH is not set 
    784788# CONFIG_HID_MAGICMOUSE is not set 
     
    796800# CONFIG_HID_QUANTA is not set 
    797801# CONFIG_HID_ROCCAT is not set 
     802# CONFIG_HID_ROCCAT_ARVO is not set 
    798803# CONFIG_HID_ROCCAT_KONE is not set 
    799804# CONFIG_HID_ROCCAT_KONEPLUS is not set 
     805# CONFIG_HID_ROCCAT_KOVAPLUS is not set 
    800806# CONFIG_HID_ROCCAT_PYRA is not set 
    801807# CONFIG_HID_SAMSUNG is not set 
     
    868874# CONFIG_I2C_DEBUG_CORE is not set 
    869875# CONFIG_I2C_DESIGNWARE is not set 
     876# CONFIG_I2C_DIOLAN_U2C is not set 
    870877# CONFIG_I2C_EG20T is not set 
    871878# CONFIG_I2C_ELEKTOR is not set 
     
    10261033CONFIG_IOSCHED_NOOP=y 
    10271034# CONFIG_IP_FIB_TRIE_STATS is not set 
     1035# CONFIG_IP_SET is not set 
    10281036# CONFIG_IP1000 is not set 
    10291037# CONFIG_IP17XX_PHY is not set 
     
    11961204# CONFIG_KEYBOARD_NEWTON is not set 
    11971205# CONFIG_KEYBOARD_OPENCORES is not set 
     1206# CONFIG_KEYBOARD_QT1070 is not set 
    11981207# CONFIG_KEYBOARD_QT2160 is not set 
    11991208# CONFIG_KEYBOARD_STOWAWAY is not set 
     
    12261235CONFIG_LEDS_GPIO_PLATFORM=y 
    12271236# CONFIG_LEDS_INTEL_SS4200 is not set 
     1237# CONFIG_LEDS_LM3530 is not set 
    12281238# CONFIG_LEDS_LP3944 is not set 
    12291239# CONFIG_LEDS_LP5521 is not set 
     
    13001310# CONFIG_MDIO_BITBANG is not set 
    13011311# CONFIG_MEDIA_ATTACH is not set 
     1312# CONFIG_MEDIA_CONTROLLER is not set 
    13021313# CONFIG_MEDIA_SUPPORT is not set 
    13031314# CONFIG_MEDIA_TUNER_CUSTOMISE is not set 
     
    13351346# CONFIG_MFD_WM8400 is not set 
    13361347# CONFIG_MFD_WM8994 is not set 
     1348# CONFIG_MFD_WL1273_CORE is not set 
    13371349# CONFIG_MG_DISK is not set 
    13381350# CONFIG_MICREL_PHY is not set 
     
    17881800# CONFIG_PATA_ALI is not set 
    17891801# CONFIG_PATA_AMD is not set 
     1802# CONFIG_PATA_ARASAN_CF is not set 
    17901803# CONFIG_PATA_ARTOP is not set 
    17911804# CONFIG_PATA_ATIIXP is not set 
     
    18851898# CONFIG_PM is not set 
    18861899# CONFIG_PM_RUNTIME is not set 
     1900# CONFIG_PMBUS is not set 
    18871901# CONFIG_PMC_MSP is not set 
    18881902# CONFIG_PMC_YOSEMITE is not set 
     
    20612075# CONFIG_RTL8366S_PHY_DEBUG_FS is not set 
    20622076# CONFIG_RTL8366_SMI is not set 
     2077# CONFIG_RTS_PSTOR is not set 
    20632078CONFIG_RT_MUTEXES=y 
    20642079# CONFIG_RT_MUTEX_TESTER is not set 
     
    21852200# CONFIG_SENSORS_ADM1031 is not set 
    21862201# CONFIG_SENSORS_ADM9240 is not set 
     2202# CONFIG_SENSORS_ADS1015 is not set 
    21872203# CONFIG_SENSORS_ADS7828 is not set 
    21882204# CONFIG_SENSORS_ADS7871 is not set 
     
    22192235# CONFIG_SENSORS_JC42 is not set 
    22202236# CONFIG_SENSORS_K8TEMP is not set 
     2237# CONFIG_SENSORS_LINEAGE is not set 
    22212238# CONFIG_SENSORS_LIS3LV02D is not set 
    22222239# CONFIG_SENSORS_LIS3_I2C is not set 
     
    22362253# CONFIG_SENSORS_LM93 is not set 
    22372254# CONFIG_SENSORS_LM95241 is not set 
     2255# CONFIG_SENSORS_LTC4151 is not set 
    22382256# CONFIG_SENSORS_LTC4215 is not set 
    22392257# CONFIG_SENSORS_LTC4245 is not set 
     
    22412259# CONFIG_SENSORS_MAX1111 is not set 
    22422260# CONFIG_SENSORS_MAX1619 is not set 
     2261# CONFIG_SENSORS_MAX6639 is not set 
    22432262# CONFIG_SENSORS_MAX6650 is not set 
    22442263# CONFIG_SENSORS_PC87360 is not set 
    22452264# CONFIG_SENSORS_PC87427 is not set 
    22462265# CONFIG_SENSORS_PCF8591 is not set 
     2266# CONFIG_SENSORS_SCH5627 is not set 
    22472267# CONFIG_SENSORS_SHT15 is not set 
    22482268# CONFIG_SENSORS_SHT21 is not set 
     
    24602480# CONFIG_SND_TRIDENT is not set 
    24612481CONFIG_SND_USB=y 
     2482# CONFIG_SND_USB_6FIRE is not set 
    24622483# CONFIG_SND_USB_AUDIO is not set 
    24632484# CONFIG_SND_USB_CAIAQ is not set 
     
    26302651# CONFIG_TOUCHSCREEN_W90X900 is not set 
    26312652# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set 
     2653# CONFIG_TPS6105X is not set 
    26322654# CONFIG_TPS65010 is not set 
    26332655# CONFIG_TPS6507X is not set 
     
    27052727# CONFIG_USB_GSPCA_MARS is not set 
    27062728# CONFIG_USB_GSPCA_MR97310A is not set 
     2729# CONFIG_USB_GSPCA_NW80X is not set 
    27072730# CONFIG_USB_GSPCA_OV519 is not set 
    27082731# CONFIG_USB_GSPCA_OV534 is not set 
     
    27312754# CONFIG_USB_GSPCA_TV8532 is not set 
    27322755# CONFIG_USB_GSPCA_VC032X is not set 
     2756# CONFIG_USB_GSPCA_VICAM is not set 
    27332757# CONFIG_USB_GSPCA_XIRLINK_CIT is not set 
    27342758# CONFIG_USB_GSPCA_ZC3XX is not set 
     
    29012925# CONFIG_USB_VIDEO_CLASS is not set 
    29022926CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y 
     2927# CONFIG_USB_VL600 is not set 
    29032928# CONFIG_USB_WDM is not set 
    29042929# CONFIG_USB_WHCI_HCD is not set 
     
    29612986# CONFIG_VIDEO_MT9V011 is not set 
    29622987# CONFIG_VIDEO_MXB is not set 
     2988# CONFIG_VIDEO_NOON010PC30 is not set 
    29632989# CONFIG_VIDEO_OUTPUT_CONTROL is not set 
    29642990# CONFIG_VIDEO_OV7670 is not set 
Note: See TracChangeset for help on using the changeset viewer.