X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4b4609facc5d78e24048fa41a9b099c062e3385f..ccd6b5b27f2bb9f9fc50d5efb1ade3f6ca82e206:/package/kernel/modules/other.mk diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 5a08ada02..392a88ed0 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -4,7 +4,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ OTHER_MENU:=Other modules @@ -72,7 +71,11 @@ define KernelPackage/eeprom-93cx6 TITLE:=EEPROM 93CX6 support DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_EEPROM_93CX6 +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) + FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) +else FILES:=$(LINUX_DIR)/drivers/misc/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) +endif AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6) endef @@ -100,7 +103,25 @@ endef $(eval $(call KernelPackage,lp)) +define KernelPackage/pcspkr + SUBMENU:=$(OTHER_MENU) + TITLE:=PC speaker support + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_INPUT_PCSPKR + FILES:= \ + $(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50, \ + pcspkr \ + ) +endef + +define KernelPackage/pcspkr/description + This enables sounds (tones) through the pc speaker +endef + +$(eval $(call KernelPackage,pcspkr)) +# This activates PCMCIA support in ssb. This will be included in kmod-ssb. define KernelPackage/pcmcia-core SUBMENU:=$(OTHER_MENU) TITLE:=PCMCIA/CardBus support @@ -111,6 +132,9 @@ define KernelPackage/pcmcia-core CONFIG_PCCARD \ CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ + CONFIG_SSB_PCMCIAHOST=y \ + CONFIG_SSB_PCMCIAHOST_POSSIBLE=y \ + CONFIG_SSB_BLOCKIO=y \ PCMCIA_DEBUG=n endef @@ -121,7 +145,7 @@ define KernelPackage/pcmcia-core/2.4 FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,pcmcia_core ds) + AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds) endef define KernelPackage/pcmcia-core/2.6 @@ -135,7 +159,7 @@ define KernelPackage/pcmcia-core/2.6 $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic) + AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia rsrc_nonstatic) endef define KernelPackage/pcmcia-core/description @@ -214,6 +238,7 @@ define KernelPackage/ssb KCONFIG:=\ CONFIG_SSB \ CONFIG_SSB_B43_PCI_BRIDGE=y \ + CONFIG_SSB_DRIVER_MIPS=n \ CONFIG_SSB_DRIVER_PCICORE=y \ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y \ CONFIG_SSB_PCIHOST=y \ @@ -235,7 +260,7 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -244,13 +269,16 @@ define KernelPackage/bluetooth CONFIG_BLUEZ_BNEP \ CONFIG_BLUEZ_HCIUART \ CONFIG_BLUEZ_HCIUSB \ + CONFIG_BLUEZ_HIDP \ CONFIG_BT \ CONFIG_BT_L2CAP \ CONFIG_BT_SCO \ CONFIG_BT_RFCOMM \ CONFIG_BT_BNEP \ + CONFIG_BT_HCIBTUSB \ CONFIG_BT_HCIUSB \ - CONFIG_BT_HCIUART + CONFIG_BT_HCIUART \ + CONFIG_BT_HIDP endef define KernelPackage/bluetooth/2.4 @@ -282,15 +310,29 @@ define KernelPackage/bluetooth/2.6 # CONFIG_BT_BNEP \ # CONFIG_BT_HCIUSB \ # CONFIG_BT_HCIUART +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.27)),1) + FILES:= \ + $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) +else FILES:= \ $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb) + AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb) +endif endef define KernelPackage/bluetooth/description @@ -580,7 +622,7 @@ define KernelPackage/input-core DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_INPUT FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,input-core) + AUTOLOAD:=$(call AutoLoad,19,input-core) endef define KernelPackage/input-core/description @@ -592,7 +634,7 @@ $(eval $(call KernelPackage,input-core)) define KernelPackage/input-evdev SUBMENU:=$(OTHER_MENU) - TITLE:=Input even device + TITLE:=Input event device DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_EVDEV FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX) @@ -608,7 +650,7 @@ $(eval $(call KernelPackage,input-evdev)) define KernelPackage/hid SUBMENU:=$(OTHER_MENU) - TITLE:=Input even device + TITLE:=HID Devices DEPENDS:=+kmod-input-core +kmod-input-evdev KCONFIG:=CONFIG_HID FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX) @@ -628,7 +670,7 @@ define KernelPackage/input-polldev DEPENDS:=+kmod-input-core @LINUX_2_6 KCONFIG:=CONFIG_INPUT_POLLDEV FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,61,input-polldev) + AUTOLOAD:=$(call AutoLoad,20,input-polldev) endef define KernelPackage/input-polldev/description @@ -655,6 +697,21 @@ endef $(eval $(call KernelPackage,input-gpio-buttons)) +define KernelPackage/input-joydev + SUBMENU:=$(OTHER_MENU) + TITLE:=Joystick device support + DEPENDS:=+kmod-input-core + KCONFIG:=CONFIG_INPUT_JOYDEV + FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,62,joydev) +endef + +define KernelPackage/input-joydev/description + Kernel module for joystick support +endef + +$(eval $(call KernelPackage,input-joydev)) + define KernelPackage/mmc-spi SUBMENU:=$(OTHER_MENU) @@ -805,7 +862,7 @@ $(eval $(call KernelPackage,textsearch)) define KernelPackage/rfkill SUBMENU:=$(OTHER_MENU) TITLE:=RF switch subsystem support - DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc + DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc @!TARGET_uml KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT \ @@ -822,4 +879,3 @@ define KernelPackage/rfkill/description endef $(eval $(call KernelPackage,rfkill)) -