From d07a68916f9cd3eb31c9bb95ab347284d0b718a0 Mon Sep 17 00:00:00 2001 From: Claudio Mignanti Date: Mon, 12 Jul 2010 14:06:13 +0000 Subject: [PATCH] massive: replace occurences of .$(LINUX_KMOD_SUFFIX) with .ko after r21950 SVN-Revision: 22145 --- include/kernel.mk | 6 -- package/acx-mac80211/Makefile | 2 +- package/acx/Makefile | 2 +- package/ar7-atm/Makefile | 2 +- package/avila-wdt/Makefile | 2 +- package/broadcom-diag/Makefile | 2 +- package/broadcom-wl/Makefile | 2 +- package/button-hotplug/Makefile | 2 +- package/carl9170/Makefile | 2 +- package/compcache/Makefile | 4 +- package/ep80579-drivers/Makefile | 12 +-- package/fuse/Makefile | 2 +- package/hostap-driver/Makefile | 8 +- package/i2c-gpio-custom/Makefile | 2 +- package/ifx-tapi/Makefile | 2 +- package/ifx-vmmc/Makefile | 2 +- package/ifxmips-dsl-api/Makefile | 6 +- package/ifxos/Makefile | 2 +- package/kernel/modules/block.mk | 66 ++++++++--------- package/kernel/modules/crypto.mk | 84 ++++++++++----------- package/kernel/modules/firewire.mk | 10 +-- package/kernel/modules/fs.mk | 60 +++++++-------- package/kernel/modules/hwmon.mk | 16 ++-- package/kernel/modules/i2c.mk | 2 +- package/kernel/modules/netdevices.mk | 64 ++++++++-------- package/kernel/modules/netfilter.mk | 58 +++++++-------- package/kernel/modules/netsupport.mk | 88 +++++++++++----------- package/kernel/modules/nls.mk | 28 +++---- package/kernel/modules/other.mk | 106 +++++++++++++-------------- package/kernel/modules/pcmcia.mk | 22 +++--- package/kernel/modules/sound.mk | 36 ++++----- package/kernel/modules/spi.mk | 12 +-- package/kernel/modules/usb.mk | 88 +++++++++++----------- package/kernel/modules/video.mk | 84 ++++++++++----------- package/kernel/modules/w1.mk | 12 +-- package/kernel/modules/wireless.mk | 20 ++--- package/kernel/modules/xen.mk | 20 ++--- package/mac80211/Makefile | 82 ++++++++++----------- package/madwifi/Makefile | 26 +++---- package/mmc_over_gpio/Makefile | 2 +- package/r8101/Makefile | 2 +- package/rtc-rv5c386a/Makefile | 2 +- package/siit/Makefile | 2 +- package/spi-ks8995/Makefile | 2 +- package/switch/Makefile | 6 +- package/ubsec_ssb/Makefile | 2 +- package/w1-gpio-custom/Makefile | 2 +- package/wprobe/Makefile | 2 +- package/wrt55agv2-spidevs/Makefile | 2 +- target/linux/adm5120/modules.mk | 6 +- target/linux/at91/modules.mk | 4 +- target/linux/au1000/modules.mk | 2 +- target/linux/avr32/modules.mk | 2 +- target/linux/brcm63xx/modules.mk | 4 +- target/linux/ixp4xx/modules.mk | 4 +- target/linux/octeon/modules.mk | 4 +- target/linux/ppc40x/modules.mk | 2 +- target/linux/ps3/modules.mk | 6 +- target/linux/pxcab/modules.mk | 2 +- target/linux/rb532/modules.mk | 6 +- target/linux/rdc/modules.mk | 2 +- target/linux/s3c24xx/modules.mk | 24 +++--- target/linux/xburst/modules.mk | 8 +- 63 files changed, 570 insertions(+), 576 deletions(-) diff --git a/include/kernel.mk b/include/kernel.mk index 63df959a48..8bce6e3518 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -16,12 +16,6 @@ ifeq ($(DUMP),1) else export GCC_HONOUR_COPTS=s - ifeq ($(KERNEL),2.6) - LINUX_KMOD_SUFFIX=ko - else - LINUX_KMOD_SUFFIX=o - endif - ifneq (,$(findstring uml,$(BOARD))) KERNEL_CC?=$(HOSTCC) KERNEL_CROSS?= diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index c7f2c8819c..a69dc5fdc5 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -25,7 +25,7 @@ define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX111 Mac80211 driver DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211 - FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) endef diff --git a/package/acx/Makefile b/package/acx/Makefile index b5d211ca49..d910dedcc6 100644 --- a/package/acx/Makefile +++ b/package/acx/Makefile @@ -28,7 +28,7 @@ define KernelPackage/acx DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +wireless-tools URL:=http://acx100.sourceforge.net/ SUBMENU:=Wireless Drivers - FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX) + FILES:= $(PKG_BUILD_DIR)/acx.ko AUTOLOAD:=$(call AutoLoad,50,acx) endef diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile index fc8b577124..9568cce13d 100644 --- a/package/ar7-atm/Makefile +++ b/package/ar7-atm/Makefile @@ -40,7 +40,7 @@ define KernelPackage/sangam-atm/Default SUBMENU:=Network Devices DEPENDS:=@TARGET_ar7 +kmod-atm TITLE:=AR7 ADSL driver - FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/tiatm.ko AUTOLOAD:=$(call AutoLoad,50,tiatm) MENU:=1 endef diff --git a/package/avila-wdt/Makefile b/package/avila-wdt/Makefile index 660c6c3339..5bf6bf4ad0 100644 --- a/package/avila-wdt/Makefile +++ b/package/avila-wdt/Makefile @@ -17,7 +17,7 @@ define KernelPackage/avila-wdt SUBMENU:=Other modules TITLE:=GPIO hardware watchdog driver for modified Avila boards DEPENDS:=@GPIO_SUPPORT @TARGET_ixp4xx - FILES:=$(PKG_BUILD_DIR)/avila-wdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/avila-wdt.ko AUTOLOAD:=$(call AutoLoad,10,avila-wdt) endef diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile index 6b6dddd8a6..7e4dbb977d 100644 --- a/package/broadcom-diag/Makefile +++ b/package/broadcom-diag/Makefile @@ -17,7 +17,7 @@ define KernelPackage/diag SUBMENU:=Other modules DEPENDS:=@TARGET_brcm47xx TITLE:=Driver for router LEDs and Buttons - FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/diag.ko endef define Build/Prepare diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index d8e07eb5a7..273c103ff3 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -34,7 +34,7 @@ define KernelPackage/brcm-wl/Default SECTION:=kernel DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +wireless-tools TITLE:=Kernel driver for BCM43xx chipsets - FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.ko AUTOLOAD:=$(call AutoLoad,30,wl) endef diff --git a/package/button-hotplug/Makefile b/package/button-hotplug/Makefile index f5a7fcd392..35791420f3 100644 --- a/package/button-hotplug/Makefile +++ b/package/button-hotplug/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/button-hotplug SUBMENU:=Other modules TITLE:=Button Hotplug driver - FILES:=$(PKG_BUILD_DIR)/button-hotplug.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/button-hotplug.ko KCONFIG:= endef diff --git a/package/carl9170/Makefile b/package/carl9170/Makefile index 34165cb48e..534f179658 100644 --- a/package/carl9170/Makefile +++ b/package/carl9170/Makefile @@ -29,7 +29,7 @@ define KernelPackage/carl9170 TITLE:=Driver for Atheros AR9170 USB sticks DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core URL:=http://www.kernel.org/pub/linux/kernel/people/chr/carl9170 - FILES:=$(DRV_PATH)/carl9170usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(DRV_PATH)/carl9170usb.ko AUTOLOAD:=$(call AutoLoad,60,carl9170usb) MENU:=1 endef diff --git a/package/compcache/Makefile b/package/compcache/Makefile index c8a4c0a04c..5106293e8d 100644 --- a/package/compcache/Makefile +++ b/package/compcache/Makefile @@ -23,8 +23,8 @@ define KernelPackage/ramzswap DEPENDS:=@BUSYBOX_CONFIG_SWAPONOFF TITLE:=Driver for compressed ram swap device VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) - FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/ramzswap.ko \ + $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.ko URL:=http://code.google.com/p/compcache/ endef diff --git a/package/ep80579-drivers/Makefile b/package/ep80579-drivers/Makefile index fac0fbbadf..f20c75219c 100644 --- a/package/ep80579-drivers/Makefile +++ b/package/ep80579-drivers/Makefile @@ -29,8 +29,8 @@ $(call KernelPackage/ep80579-drivers/Default) SUBMENU:=Network Devices TITLE:=Intel EP80579 ethernet driver FILES:= \ - $(PKG_BUILD_DIR)/Embedded/build/gcu.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/Embedded/build/iegbe.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/Embedded/build/gcu.ko \ + $(PKG_BUILD_DIR)/Embedded/build/iegbe.ko AUTOLOAD:=$(call AutoLoad,40,gcu iegbe) endef @@ -39,8 +39,8 @@ $(call KernelPackage/ep80579-drivers/Default) SUBMENU:=Other modules TITLE:=Misc. Intel EP80579 drivers (DMA,, gpio) FILES:= \ - $(PKG_BUILD_DIR)/Embedded/build/dma.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/Embedded/build/gpio.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/Embedded/build/dma.ko \ + $(PKG_BUILD_DIR)/Embedded/build/gpio.ko AUTOLOAD:=$(call AutoLoad,40,gpio dma) endef @@ -49,8 +49,8 @@ $(call KernelPackage/ep80579-drivers/Default) SUBMENU:=Other modules TITLE:=Intel EP80579 CAN driver FILES:= \ - $(PKG_BUILD_DIR)/Embedded/build/timesync.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/Embedded/build/can.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/Embedded/build/timesync.ko \ + $(PKG_BUILD_DIR)/Embedded/build/can.ko AUTOLOAD:=$(call AutoLoad,40,timesync can) endef diff --git a/package/fuse/Makefile b/package/fuse/Makefile index cbd15e83b8..ceae7d80bc 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -50,7 +50,7 @@ define KernelPackage/fuse SUBMENU:=Filesystems TITLE+= (kernel module) KCONFIG:= CONFIG_FUSE_FS - FILES:=$(LINUX_DIR)/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE) AUTOLOAD:=$(call AutoLoad,80,fuse) endef diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile index 2b83bda96e..8a70ad8df9 100644 --- a/package/hostap-driver/Makefile +++ b/package/hostap-driver/Makefile @@ -36,7 +36,7 @@ $(call KernelPackage/hostap/Default) TITLE:=Host AP support for Prism2/2.5/3 DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-lib80211 +wireless-tools KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y - FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.ko AUTOLOAD:=$(call AutoLoad,60,hostap) endef @@ -53,7 +53,7 @@ $(call KernelPackage/hostap/Default) TITLE:=Host AP driver for PCMCIA adaptors DEPENDS:=@PCMCIA_SUPPORT +kmod-hostap +kmod-pcmcia-core KCONFIG:=CONFIG_HOSTAP_CS - FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_cs.ko AUTOLOAD:=$(call AutoLoad,60,hostap_cs) endef @@ -68,7 +68,7 @@ $(call KernelPackage/hostap/Default) TITLE:=Host AP driver for PCI adaptors DEPENDS:=@PCI_SUPPORT +kmod-hostap KCONFIG:=CONFIG_HOSTAP_PCI - FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.ko AUTOLOAD:=$(call AutoLoad,60,hostap_pci) endef @@ -83,7 +83,7 @@ $(call KernelPackage/hostap/Default) TITLE:=Host AP driver for PLX9052 based PCI adaptors DEPENDS:=@PCI_SUPPORT +kmod-hostap KCONFIG:=CONFIG_HOSTAP_PLX - FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.ko AUTOLOAD:=$(call AutoLoad,60,hostap_plx) endef diff --git a/package/i2c-gpio-custom/Makefile b/package/i2c-gpio-custom/Makefile index 954974249a..8585a5ab57 100644 --- a/package/i2c-gpio-custom/Makefile +++ b/package/i2c-gpio-custom/Makefile @@ -17,7 +17,7 @@ define KernelPackage/i2c-gpio-custom SUBMENU:=I2C support TITLE:=Custom GPIO-based I2C device DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-i2c-gpio - FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.ko KCONFIG:= endef diff --git a/package/ifx-tapi/Makefile b/package/ifx-tapi/Makefile index 68282b81a0..477754dc24 100644 --- a/package/ifx-tapi/Makefile +++ b/package/ifx-tapi/Makefile @@ -26,7 +26,7 @@ define KernelPackage/ifx-tapi URL:=http://www.lantiq.com/ MAINTAINER:=Lantiq DEPENDS:=+kmod-ifxos @BROKEN - FILES:=$(PKG_BUILD_DIR)/src/drv_tapi.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/src/drv_tapi.ko AUTOLOAD:=$(call AutoLoad,20,drv_tapi) MENU:=1 endef diff --git a/package/ifx-vmmc/Makefile b/package/ifx-vmmc/Makefile index ac311e06d4..c7f1593bf1 100644 --- a/package/ifx-vmmc/Makefile +++ b/package/ifx-vmmc/Makefile @@ -26,7 +26,7 @@ define KernelPackage/ifx-vmmc URL:=http://www.lantiq.com/ MAINTAINER:=Lantiq DEPENDS:=+kmod-ifx-tapi @BROKEN - FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko AUTOLOAD:=$(call AutoLoad,25,drv_vmmc) MENU:=1 endef diff --git a/package/ifxmips-dsl-api/Makefile b/package/ifxmips-dsl-api/Makefile index 3a27d5d4bd..a62caef6fd 100644 --- a/package/ifxmips-dsl-api/Makefile +++ b/package/ifxmips-dsl-api/Makefile @@ -42,9 +42,9 @@ define KernelPackage/ifxmips-dsl-api URL:=http://www.infineon.com/ MAINTAINER:=Infineon Technologies AG / Lantiq / John Crispin DEPENDS:=@TARGET_ifxmips +kmod-atm @BROKEN - FILES:=$(PKG_BUILD_DIR)/src/mei/ifxmips_mei.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/src/mei/ifxmips_atm.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/src/mei/ifxmips_mei.ko \ + $(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.ko \ + $(PKG_BUILD_DIR)/src/mei/ifxmips_atm.ko AUTOLOAD:=$(call AutoLoad,50,ifxmips_mei drv_dsl_cpe_api ifxmips_atm) MENU:=1 endef diff --git a/package/ifxos/Makefile b/package/ifxos/Makefile index 7f13bc9058..10bab882d5 100644 --- a/package/ifxos/Makefile +++ b/package/ifxos/Makefile @@ -23,7 +23,7 @@ define KernelPackage/ifxos URL:=http://www.lantiq.com/ MAINTAINER:=Lantiq DEPENDS:=@TARGET_ifxmips @BROKEN - FILES:=$(PKG_BUILD_DIR)/src/drv_ifxos.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/src/drv_ifxos.ko AUTOLOAD:=$(call AutoLoad,10,drv_ifxos) endef diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 25024c6979..638ffd3b73 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -11,7 +11,7 @@ define KernelPackage/aoe SUBMENU:=$(BLOCK_MENU) TITLE:=ATA over Ethernet support KCONFIG:=CONFIG_ATA_OVER_ETH - FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.ko AUTOLOAD:=$(call AutoLoad,30,aoe) endef @@ -27,7 +27,7 @@ define KernelPackage/ata-core TITLE:=Serial and Parallel ATA support DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) KCONFIG:=CONFIG_ATA - FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/libata.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) endef @@ -43,7 +43,7 @@ endef define KernelPackage/ata-ahci TITLE:=AHCI Serial ATA support KCONFIG:=CONFIG_SATA_AHCI - FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/ahci.ko AUTOLOAD:=$(call AutoLoad,41,ahci,1) $(call AddDepends/ata) endef @@ -58,7 +58,7 @@ $(eval $(call KernelPackage,ata-ahci)) define KernelPackage/ata-artop TITLE:=ARTOP 6210/6260 PATA support KCONFIG:=CONFIG_PATA_ARTOP - FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.ko AUTOLOAD:=$(call AutoLoad,41,pata_artop,1) $(call AddDepends/ata) endef @@ -73,7 +73,7 @@ $(eval $(call KernelPackage,ata-artop)) define KernelPackage/ata-nvidia-sata TITLE:=Nvidia Serial ATA support KCONFIG:=CONFIG_SATA_NV - FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.ko AUTOLOAD:=$(call AutoLoad,41,sata_nv,1) $(call AddDepends/ata) endef @@ -88,7 +88,7 @@ define KernelPackage/ata-pdc202xx-old KCONFIG:= \ CONFIG_ATA_SFF=y \ CONFIG_PATA_PDC_OLD - FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.ko AUTOLOAD:=$(call AutoLoad,41,pata_pdc202xx_old,1) endef @@ -103,7 +103,7 @@ $(eval $(call KernelPackage,ata-pdc202xx-old)) define KernelPackage/ata-piix TITLE:=Intel PIIX PATA/SATA support KCONFIG:=CONFIG_ATA_PIIX - FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.ko AUTOLOAD:=$(call AutoLoad,41,ata_piix,1) $(call AddDepends/ata) endef @@ -119,7 +119,7 @@ $(eval $(call KernelPackage,ata-piix)) define KernelPackage/ata-sil TITLE:=Silicon Image SATA support KCONFIG:=CONFIG_SATA_SIL - FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.ko AUTOLOAD:=$(call AutoLoad,41,sata_sil,1) $(call AddDepends/ata) endef @@ -134,7 +134,7 @@ $(eval $(call KernelPackage,ata-sil)) define KernelPackage/ata-sil24 TITLE:=Silicon Image 3124/3132 SATA support KCONFIG:=CONFIG_SATA_SIL24 - FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.ko AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1) $(call AddDepends/ata) endef @@ -149,7 +149,7 @@ $(eval $(call KernelPackage,ata-sil24)) define KernelPackage/ata-via-sata TITLE:=VIA SATA support KCONFIG:=CONFIG_SATA_VIA - FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/sata_via.ko AUTOLOAD:=$(call AutoLoad,41,sata_via,1) $(call AddDepends/ata) endef @@ -165,7 +165,7 @@ define KernelPackage/block2mtd SUBMENU:=$(BLOCK_MENU) TITLE:=Block device MTD emulation KCONFIG:=CONFIG_MTD_BLOCK2MTD - FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.ko endef $(eval $(call KernelPackage,block2mtd)) @@ -190,7 +190,7 @@ define KernelPackage/dm CONFIG_MD=y \ CONFIG_BLK_DEV_DM \ CONFIG_DM_MIRROR - FILES:=$(LINUX_DIR)/drivers/md/dm-*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/md/dm-*.ko AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror) endef @@ -215,15 +215,15 @@ define KernelPackage/ide-core CONFIG_BLK_DEV_IDEDMA_PCI=y \ CONFIG_BLK_DEV_IDEPCI=y FILES:= \ - $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ide/ide-core.ko AUTOLOAD:= \ $(call AutoLoad,20,ide-core,1) endef define KernelPackage/ide-core/2.4 FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ide/ide-detect.ko \ + $(LINUX_DIR)/drivers/ide/ide-disk.ko AUTOLOAD+= \ $(call AutoLoad,35,ide-detect,1) \ $(call AutoLoad,40,ide-disk,1) @@ -231,7 +231,7 @@ endef define KernelPackage/ide-core/2.6 FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ide/ide-gd_mod.ko AUTOLOAD+= \ $(call AutoLoad,40,ide-gd_mod,1) endef @@ -263,14 +263,14 @@ endef define KernelPackage/ide-generic/2.4 FILES+= \ - $(LINUX_DIR)/drivers/ide/pci/generic.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ide/pci/generic.ko AUTOLOAD+= \ $(call AutoLoad,30,generic,1) endef define KernelPackage/ide-generic/2.6 FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ide/ide-pci-generic.ko AUTOLOAD+= \ $(call AutoLoad,30,ide-pci-generic,1) endef @@ -282,7 +282,7 @@ define KernelPackage/ide-generic-old SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for generic (legacy) IDE chipsets KCONFIG:=CONFIG_IDE_GENERIC - FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.ko AUTOLOAD:=$(call AutoLoad,30,ide-generic,1) $(call AddDepends/ide) endef @@ -294,13 +294,13 @@ define KernelPackage/ide-aec62xx TITLE:=Acard AEC62xx IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_AEC62XX - FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.ko AUTOLOAD:=$(call AutoLoad,30,aec62xx,1) $(call AddDepends/ide) endef define KernelPackage/ide-aec62xx/2.4 - FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.ko endef define KernelPackage/ide-aec62xx/description @@ -314,13 +314,13 @@ define KernelPackage/ide-pdc202xx TITLE:=Promise PDC202xx IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD - FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.ko AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old,1) $(call AddDepends/ide) endef define KernelPackage/ide-pdc202xx/2.4 - FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.ko endef define KernelPackage/ide-pdc202xx/description @@ -335,7 +335,7 @@ define KernelPackage/ide-it821x TITLE:=ITE IT821x IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_IT821X - FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) + FILES=$(LINUX_DIR)/drivers/ide/it821x.ko AUTOLOAD:=$(call AutoLoad,30,it821x,1) $(call AddDepends/ide) endef @@ -357,8 +357,8 @@ define KernelPackage/libsas CONFIG_SCSI_SAS_HOST_SMP=y \ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.ko \ + $(LINUX_DIR)/drivers/scsi/libsas/libsas.ko AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1) endef @@ -375,7 +375,7 @@ define KernelPackage/loop KCONFIG:= \ CONFIG_BLK_DEV_LOOP \ CONFIG_BLK_DEV_CRYPTOLOOP=n - FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/loop.ko AUTOLOAD:=$(call AutoLoad,30,loop) endef @@ -392,9 +392,9 @@ define KernelPackage/mvsas DEPENDS:=@TARGET_x86 +kmod-libsas KCONFIG:=CONFIG_SCSI_MVSAS ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30),) - FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.ko else - FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.ko endif AUTOLOAD:=$(call AutoLoad,40,mvsas,1) endef @@ -410,7 +410,7 @@ define KernelPackage/nbd SUBMENU:=$(BLOCK_MENU) TITLE:=Network block device support KCONFIG:=CONFIG_BLK_DEV_NBD - FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/nbd.ko AUTOLOAD:=$(call AutoLoad,30,nbd) endef @@ -429,8 +429,8 @@ define KernelPackage/scsi-core CONFIG_SCSI \ CONFIG_BLK_DEV_SD FILES:= \ - $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \ - $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) + $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.ko) \ + $(LINUX_DIR)/drivers/scsi/sd_mod.ko AUTOLOAD:=$(call AutoLoad,20,scsi_mod,1) $(call AutoLoad,40,sd_mod,1) endef @@ -443,7 +443,7 @@ define KernelPackage/scsi-generic KCONFIG:= \ CONFIG_CHR_DEV_SG FILES:= \ - $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/scsi/sg.ko AUTOLOAD:=$(call AutoLoad,65,sg) endef diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index d2c9dc4993..1e15f45a3f 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -33,7 +33,7 @@ CRYPTO_MODULES = \ DEFLATE=deflate crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) -crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).$(LINUX_KMOD_SUFFIX)) +crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko) crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1)))) # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is @@ -47,7 +47,7 @@ define KernelPackage/crypto-core endef define KernelPackage/crypto-core/2.4 - FILES:=$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,01, deflate) endef @@ -68,8 +68,8 @@ define KernelPackage/crypto-hw-padlock CONFIG_CRYPTO_DEV_PADLOCK_AES \ CONFIG_CRYPTO_DEV_PADLOCK_SHA FILES:= \ - $(LINUX_DIR)/drivers/crypto/padlock-aes.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/crypto/padlock-sha.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/crypto/padlock-aes.ko \ + $(LINUX_DIR)/drivers/crypto/padlock-sha.ko AUTOLOAD:=$(call AutoLoad,09,padlock-aes padlock-sha) $(call AddDepends/crypto) endef @@ -82,7 +82,7 @@ define KernelPackage/crypto-hw-geode KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE - FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko AUTOLOAD:=$(call AutoLoad,09,geode-aes) $(call AddDepends/crypto) endef @@ -98,7 +98,7 @@ define KernelPackage/crypto-hw-hifn-795x CONFIG_HW_RANDOM=y \ CONFIG_CRYPTO_DEV_HIFN_795X \ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y - FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.ko AUTOLOAD:=$(call AutoLoad,09,hifn_795x) $(call AddDepends/crypto,+kmod-crypto-des) endef @@ -112,7 +112,7 @@ define KernelPackage/crypto-hw-ixp4xx KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_IXP4XX - FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des) endef @@ -130,7 +130,7 @@ define KernelPackage/crypto-hw-ppc4xx KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PPC4XX - FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.ko AUTOLOAD:=$(call AutoLoad,90,crypto4xx) $(call AddDepends/crypto) endef @@ -145,13 +145,13 @@ $(eval $(call KernelPackage,crypto-hw-ppc4xx)) define KernelPackage/crypto-aes TITLE:=AES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).ko AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX)) $(call AddDepends/crypto) endef define KernelPackage/crypto-aes/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX) + FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586) endef @@ -161,7 +161,7 @@ $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 TITLE:=ARC4 (RC4) cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_ARC4 - FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/arc4.ko AUTOLOAD:=$(call AutoLoad,09,arc4) $(call AddDepends/crypto) endef @@ -172,7 +172,7 @@ $(eval $(call KernelPackage,crypto-arc4)) define KernelPackage/crypto-authenc TITLE:=Combined mode wrapper for IPsec KCONFIG:=CONFIG_CRYPTO_AUTHENC - FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/authenc.ko AUTOLOAD:=$(call AutoLoad,09,authenc) $(call AddDepends/crypto) endef @@ -182,7 +182,7 @@ $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des TITLE:=DES/3DES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_DES - FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).ko AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX)) $(call AddDepends/crypto) endef @@ -193,7 +193,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac TITLE:=HMAC digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_HMAC - FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/hmac.ko AUTOLOAD:=$(call AutoLoad,09,hmac) $(call AddDepends/crypto) endef @@ -204,7 +204,7 @@ $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 TITLE:=MD5 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MD5 - FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/md5.ko AUTOLOAD:=$(call AutoLoad,09,md5) $(call AddDepends/crypto) endef @@ -215,7 +215,7 @@ $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic TITLE:=Michael MIC keyed digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC - FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/michael_mic.ko AUTOLOAD:=$(call AutoLoad,09,michael_mic) $(call AddDepends/crypto) endef @@ -226,7 +226,7 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 TITLE:=SHA1 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_SHA1 - FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).ko AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX)) $(call AddDepends/crypto) endef @@ -256,32 +256,32 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_TWOFISH_586 \ CONFIG_CRYPTO_WP512 FILES:= \ - $(LINUX_DIR)/crypto/anubis.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/blowfish.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/cast5.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/cast6.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/khazad.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/md4.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/serpent.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/anubis.ko \ + $(LINUX_DIR)/crypto/blowfish.ko \ + $(LINUX_DIR)/crypto/cast5.ko \ + $(LINUX_DIR)/crypto/cast6.ko \ + $(LINUX_DIR)/crypto/khazad.ko \ + $(LINUX_DIR)/crypto/md4.ko \ + $(LINUX_DIR)/crypto/serpent.ko \ + $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \ + $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \ + $(LINUX_DIR)/crypto/tea.ko \ + $(LINUX_DIR)/crypto/twofish.ko \ + $(LINUX_DIR)/crypto/wp512.ko $(call AddDepends/crypto) endef define KernelPackage/crypto-misc/2.6 FILES+= \ - $(LINUX_DIR)/crypto/camellia.$(LINUX_KMOD_SUFFIX) \ - $(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX)) \ - $(LINUX_DIR)/crypto/fcrypt.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/tgr192.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/twofish_common.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/camellia.ko \ + $(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.ko) \ + $(LINUX_DIR)/crypto/fcrypt.ko \ + $(LINUX_DIR)/crypto/tgr192.ko \ + $(LINUX_DIR)/crypto/twofish_common.ko endef define KernelPackage/crypto-misc/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.$(LINUX_KMOD_SUFFIX) + FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko endef $(eval $(call KernelPackage,crypto-misc)) @@ -297,9 +297,9 @@ define KernelPackage/crypto-ocf CONFIG_OCF_FIPS=y \ CONFIG_OCF_RANDOMHARVEST=y FILES:= \ - $(LINUX_DIR)/crypto/ocf/ocf.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/ocf/cryptodev.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/ocf/cryptosoft.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/ocf/ocf.ko \ + $(LINUX_DIR)/crypto/ocf/cryptodev.ko \ + $(LINUX_DIR)/crypto/ocf/cryptosoft.ko AUTOLOAD:=$(call AutoLoad,09, \ ocf \ cryptodev \ @@ -315,7 +315,7 @@ define KernelPackage/crypto-ocf-hifn7751 TITLE:=OCF support for Hifn 6500/7751/7811/795x, Invertex AEON and NetSec 7751 devices DEPENDS:=+@OPENSSL_ENGINE @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf KCONFIG:=CONFIG_OCF_HIFN - FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko AUTOLOAD:=$(call AutoLoad,10,hifn7751) $(call AddDepends/crypto) endef @@ -327,7 +327,7 @@ define KernelPackage/crypto-ocf-hifnhipp TITLE:=OCF support for Hifn 7855/8155 devices DEPENDS:=+@OPENSSL_ENGINE @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf KCONFIG:=CONFIG_OCF_HIFNHIPP - FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko AUTOLOAD:=$(call AutoLoad,10,hifnhipp) $(call AddDepends/crypto) endef @@ -338,7 +338,7 @@ $(eval $(call KernelPackage,crypto-ocf-hifnhipp)) define KernelPackage/crypto-null TITLE:=Null CryptoAPI module KCONFIG:=CONFIG_CRYPTO_NULL - FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/crypto_null.ko AUTOLOAD:=$(call AutoLoad,09,crypto_null) $(call AddDepends/crypto) endef @@ -349,7 +349,7 @@ $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test TITLE:=Test CryptoAPI module KCONFIG:=CONFIG_CRYPTO_TEST - FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/tcrypt.ko $(call AddDepends/crypto) endef diff --git a/package/kernel/modules/firewire.mk b/package/kernel/modules/firewire.mk index 6ba02cd04d..60908a0eb3 100644 --- a/package/kernel/modules/firewire.mk +++ b/package/kernel/modules/firewire.mk @@ -18,7 +18,7 @@ define KernelPackage/ieee1394 TITLE:=Support for FireWire DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_IEEE1394 - FILES:=$(LINUX_DIR)/drivers/ieee1394/ieee1394.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ieee1394/ieee1394.ko AUTOLOAD:=$(call AutoLoad,20,ieee1394) endef @@ -33,7 +33,7 @@ define KernelPackage/ohci1394 $(call firewiredep,) TITLE:=Support for OHCI-1394 controllers KCONFIG:= CONFIG_IEEE1394_OHCI1394 - FILES:=$(LINUX_DIR)/drivers/ieee1394/ohci1394.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ieee1394/ohci1394.ko AUTOLOAD:=$(call AutoLoad,50,ohci1394) endef @@ -50,7 +50,7 @@ define KernelPackage/sbp2 KCONFIG:= \ CONFIG_IEEE1394_SBP2 \ CONFIG_IEEE1394_SBP2_PHYS_DMA=n - FILES:=$(LINUX_DIR)/drivers/ieee1394/sbp2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ieee1394/sbp2.ko AUTOLOAD:=$(call AutoLoad,50,sbp2) endef @@ -65,7 +65,7 @@ define KernelPackage/raw1394 $(call firewiredep,kmod-ohci1394) TITLE:=Support for Raw I/O for FireWire devices KCONFIG:=CONFIG_IEEE1394_RAWIO - FILES:=$(LINUX_DIR)/drivers/ieee1394/raw1394.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ieee1394/raw1394.ko AUTOLOAD:=$(call AutoLoad,50,raw1394) endef @@ -80,7 +80,7 @@ define KernelPackage/video1394 $(call firewiredep,kmod-ohci1394) TITLE:=Support for FireWire video KCONFIG:=CONFIG_IEEE1394_VIDEO1394 - FILES:=$(LINUX_DIR)/drivers/ieee1394/video1394.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ieee1394/video1394.ko AUTOLOAD:=$(call AutoLoad,50,video1394) endef diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 6cbf4450ff..da52b32eca 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -11,7 +11,7 @@ define KernelPackage/fs-autofs4 SUBMENU:=$(FS_MENU) TITLE:=AUTOFS4 filesystem support KCONFIG:=CONFIG_AUTOFS4_FS - FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko AUTOLOAD:=$(call AutoLoad,30,autofs4) endef @@ -32,8 +32,8 @@ define KernelPackage/fs-btrfs CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n FILES:=\ - $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/lib/libcrc32c.ko \ + $(LINUX_DIR)/fs/btrfs/btrfs.ko AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs,1) endef @@ -48,7 +48,7 @@ define KernelPackage/fs-cifs SUBMENU:=$(FS_MENU) TITLE:=CIFS support KCONFIG:=CONFIG_CIFS - FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) endef @@ -64,7 +64,7 @@ define KernelPackage/fs-exportfs SUBMENU:=$(FS_MENU) TITLE:=exportfs kernel server support KCONFIG:=CONFIG_EXPORTFS - FILES=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX) + FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko AUTOLOAD:=$(call AutoLoad,20,exportfs) endef @@ -80,7 +80,7 @@ define KernelPackage/fs-ext2 TITLE:=EXT2 filesystem support KCONFIG:=CONFIG_EXT2_FS DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) - FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko AUTOLOAD:=$(call AutoLoad,32,ext2,1) endef @@ -99,8 +99,8 @@ define KernelPackage/fs-ext3 CONFIG_JBD DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) FILES:= \ - $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/ext3/ext3.ko \ + $(LINUX_DIR)/fs/jbd/jbd.ko AUTOLOAD:=$(call AutoLoad,31,jbd ext3,1) endef @@ -122,8 +122,8 @@ define KernelPackage/fs-ext4 CONFIG_JBD2 DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) FILES:= \ - $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/ext4/ext4.ko \ + $(LINUX_DIR)/fs/jbd2/jbd2.ko AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) $(call AddDepends/crc16) endef @@ -139,7 +139,7 @@ define KernelPackage/fs-hfs SUBMENU:=$(FS_MENU) TITLE:=HFS+ filesystem support KCONFIG:=CONFIG_HFS_FS - FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko AUTOLOAD:=$(call AutoLoad,30,hfs) $(call AddDepends/nls) endef @@ -155,7 +155,7 @@ define KernelPackage/fs-hfsplus SUBMENU:=$(FS_MENU) TITLE:=HFS+ filesystem support KCONFIG:=CONFIG_HFSPLUS_FS - FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko AUTOLOAD:=$(call AutoLoad,30,hfsplus) $(call AddDepends/nls,utf8) endef @@ -171,7 +171,7 @@ define KernelPackage/fs-isofs SUBMENU:=$(FS_MENU) TITLE:=ISO9660 filesystem support KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n - FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko AUTOLOAD:=$(call AutoLoad,30,isofs) $(call AddDepends/nls) endef @@ -188,7 +188,7 @@ define KernelPackage/fs-mbcache TITLE:=mbcache (used by ext2/ext3/ext4) KCONFIG:=CONFIG_FS_MBCACHE ifneq ($(CONFIG_FS_MBCACHE),) - FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/mbcache.ko AUTOLOAD:=$(call AutoLoad,20,mbcache,1) endif endef @@ -206,7 +206,7 @@ define KernelPackage/fs-minix SUBMENU:=$(FS_MENU) TITLE:=Minix filesystem support KCONFIG:=CONFIG_MINIX_FS - FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/minix/minix.ko AUTOLOAD:=$(call AutoLoad,30,minix) endef @@ -221,13 +221,13 @@ define KernelPackage/fs-msdos SUBMENU:=$(FS_MENU) TITLE:=MSDOS filesystem support KCONFIG:=CONFIG_MSDOS_FS - FILES:=$(LINUX_DIR)/fs/fat/msdos.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/fat/msdos.ko AUTOLOAD:=$(call AutoLoad,40,msdos) $(call AddDepends/nls) endef define KernelPackage/fs-msdos/2.4 - FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/msdos/msdos.ko endef define KernelPackage/fs-msdos/description @@ -244,7 +244,7 @@ define KernelPackage/fs-nfs KCONFIG:= \ CONFIG_NFS_FS FILES:= \ - $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/nfs/nfs.ko AUTOLOAD:=$(call AutoLoad,40,nfs) endef @@ -262,8 +262,8 @@ define KernelPackage/fs-nfs-common CONFIG_LOCKD \ CONFIG_SUNRPC FILES:= \ - $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/lockd/lockd.ko \ + $(LINUX_DIR)/net/sunrpc/sunrpc.ko AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd) endef @@ -278,7 +278,7 @@ define KernelPackage/fs-nfs-common-v4 CONFIG_NFS_V4=y\ CONFIG_NFSD_V4=y DEPENDS:= @BROKEN - FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX) + FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko AUTOLOAD=$(call AutoLoad,30,auth_rpcgss) endef @@ -294,7 +294,7 @@ define KernelPackage/fs-nfsd TITLE:=NFS kernel server support DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs KCONFIG:=CONFIG_NFSD - FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko AUTOLOAD:=$(call AutoLoad,40,nfsd) endef @@ -309,7 +309,7 @@ define KernelPackage/fs-ntfs SUBMENU:=$(FS_MENU) TITLE:=NTFS filesystem support KCONFIG:=CONFIG_NTFS_FS - FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko AUTOLOAD:=$(call AutoLoad,30,ntfs) $(call AddDepends/nls) endef @@ -325,7 +325,7 @@ define KernelPackage/fs-reiserfs SUBMENU:=$(FS_MENU) TITLE:=ReiserFS filesystem support KCONFIG:=CONFIG_REISERFS_FS - FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko AUTOLOAD:=$(call AutoLoad,30,reiserfs,1) endef @@ -340,7 +340,7 @@ define KernelPackage/fs-udf SUBMENU:=$(FS_MENU) TITLE:=UDF filesystem support KCONFIG:=CONFIG_UDF_FS - FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/udf/udf.ko AUTOLOAD:=$(call AutoLoad,30,udf) $(call AddDepends/nls) endef @@ -359,16 +359,16 @@ define KernelPackage/fs-vfat CONFIG_FAT_FS \ CONFIG_VFAT_FS FILES:= \ - $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/fat/vfat.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/fat/fat.ko \ + $(LINUX_DIR)/fs/fat/vfat.ko AUTOLOAD:=$(call AutoLoad,30,fat vfat) $(call AddDepends/nls) endef define KernelPackage/fs-vfat/2.4 FILES:= \ - $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/fat/fat.ko \ + $(LINUX_DIR)/fs/vfat/vfat.ko endef define KernelPackage/fs-vfat/description @@ -383,7 +383,7 @@ define KernelPackage/fs-xfs TITLE:=XFS filesystem support KCONFIG:=CONFIG_XFS_FS DEPENDS:= +kmod-fs-exportfs - FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko AUTOLOAD:=$(call AutoLoad,30,xfs,1) endef diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index 3b4a39c75a..b4390f78b2 100644 --- a/package/kernel/modules/hwmon.mk +++ b/package/kernel/modules/hwmon.mk @@ -14,7 +14,7 @@ define KernelPackage/hwmon-core CONFIG_HWMON \ CONFIG_HWMON_DEBUG_CHIP=n FILES:= \ - $(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/hwmon/hwmon.ko AUTOLOAD:=$(call AutoLoad,40,hwmon) endef @@ -34,7 +34,7 @@ endef define KernelPackage/hwmon-lm75 TITLE:=LM75 monitoring support KCONFIG:=CONFIG_SENSORS_LM75 - FILES:=$(LINUX_DIR)/drivers/hwmon/lm75.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/hwmon/lm75.ko AUTOLOAD:=$(call AutoLoad,60,lm75) $(call AddDepends/hwmon,+kmod-i2c-core) endef @@ -49,7 +49,7 @@ $(eval $(call KernelPackage,hwmon-lm75)) define KernelPackage/hwmon-lm77 TITLE:=LM77 monitoring support KCONFIG:=CONFIG_SENSORS_LM77 - FILES:=$(LINUX_DIR)/drivers/hwmon/lm77.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/hwmon/lm77.ko AUTOLOAD:=$(call AutoLoad,60,lm77) $(call AddDepends/hwmon,+kmod-i2c-core) endef @@ -64,7 +64,7 @@ $(eval $(call KernelPackage,hwmon-lm77)) define KernelPackage/hwmon-lm90 TITLE:=LM90 monitoring support KCONFIG:=CONFIG_SENSORS_LM90 - FILES:=$(LINUX_DIR)/drivers/hwmon/lm90.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/hwmon/lm90.ko AUTOLOAD:=$(call AutoLoad,60,lm90) $(call AddDepends/hwmon,+kmod-i2c-core) endef @@ -82,8 +82,8 @@ define KernelPackage/hwmon-pc87360 CONFIG_SENSORS_PC87360 \ CONFIG_HWMON_VID FILES:= \ - $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/hwmon/hwmon-vid.ko \ + $(LINUX_DIR)/drivers/hwmon/pc87360.ko AUTOLOAD:=$(call AutoLoad,50,hwmon-vid pc87360) $(call AddDepends/hwmon,@TARGET_x86) endef @@ -101,8 +101,8 @@ define KernelPackage/hwmon-w83627hf CONFIG_SENSORS_W83627HF \ CONFIG_HWMON_VID FILES:= \ - $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/hwmon/w83627hf.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/hwmon/hwmon-vid.ko \ + $(LINUX_DIR)/drivers/hwmon/w83627hf.ko AUTOLOAD:=$(call AutoLoad,50,hwmon-vid w83627hf) $(call AddDepends/hwmon,@TARGET_rdc||TARGET_x86) endef diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 2d2a3e908a..14fbcf8e9e 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -8,7 +8,7 @@ I2C_MENU:=I2C support ModuleConfVar=$(word 1,$(subst :,$(space),$(1))) -ModuleFullPath=$(if $(findstring y,$($(call ModuleConfVar,$(1)))),,$(LINUX_DIR)/$(word 2,$(subst :,$(space),$(1))).$(LINUX_KMOD_SUFFIX)) +ModuleFullPath=$(if $(findstring y,$($(call ModuleConfVar,$(1)))),,$(LINUX_DIR)/$(word 2,$(subst :,$(space),$(1))).ko) ModuleKconfig=$(foreach mod,$(1),$(call ModuleConfVar,$(mod))) ModuleFiles=$(foreach mod,$(1),$(call ModuleFullPath,$(mod))) ModuleAuto=$(call AutoLoad,$(1),$(foreach mod,$(2),$(basename $(notdir $(call ModuleFullPath,$(mod))))),$(3)) diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 9095357146..d9e9a3c7ed 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -11,7 +11,7 @@ define KernelPackage/libphy SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=PHY library KCONFIG:=CONFIG_PHYLIB - FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.ko AUTOLOAD:=$(call AutoLoad,40,libphy) endef @@ -26,7 +26,7 @@ define KernelPackage/swconfig TITLE:=switch configuration API DEPENDS:=+kmod-libphy KCONFIG:=CONFIG_SWCONFIG - FILES:=$(LINUX_DIR)/drivers/net/phy/swconfig.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/phy/swconfig.ko AUTOLOAD:=$(call AutoLoad,41,swconfig) endef @@ -41,7 +41,7 @@ define KernelPackage/switch-ip175c TITLE:=IC+ IP175C/IP178C switch support DEPENDS:=+kmod-swconfig KCONFIG:=CONFIG_IP175C_PHY - FILES:=$(LINUX_DIR)/drivers/net/phy/ip175c.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/phy/ip175c.ko AUTOLOAD:=$(call AutoLoad,42,ip175c) endef @@ -56,7 +56,7 @@ define KernelPackage/natsemi TITLE:=National Semiconductor DP8381x series DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_NATSEMI - FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/natsemi.ko AUTOLOAD:=$(call AutoLoad,20,natsemi) endef @@ -74,7 +74,7 @@ define KernelPackage/r6040 DEPENDS:=@TARGET_rdc KCONFIG:=CONFIG_R6040 \ CONFIG_R6040_NAPI=y - FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/r6040.ko AUTOLOAD:=$(call AutoLoad,99,r6040) endef @@ -90,7 +90,7 @@ define KernelPackage/sis900 TITLE:=SiS 900 Ethernet support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_SIS900 - FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/sis900.ko AUTOLOAD:=$(call AutoLoad,50,sis900) endef @@ -106,7 +106,7 @@ define KernelPackage/sky2 TITLE:=SysKonnect Yukon2 support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_SKY2 - FILES:=$(LINUX_DIR)/drivers/net/sky2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/sky2.ko AUTOLOAD:=$(call AutoLoad,50,sky2) endef @@ -129,7 +129,7 @@ define KernelPackage/via-rhine DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_VIA_RHINE \ CONFIG_VIA_RHINE_MMIO=y - FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/via-rhine.ko AUTOLOAD:=$(call AutoLoad,50,via-rhine) endef @@ -145,7 +145,7 @@ define KernelPackage/via-velocity TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 KCONFIG:=CONFIG_VIA_VELOCITY - FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/via-velocity.ko AUTOLOAD:=$(call AutoLoad,50,via-velocity) endef @@ -165,7 +165,7 @@ define KernelPackage/8139too CONFIG_8139TOO_TUNE_TWISTER=n \ CONFIG_8139TOO_8129=n \ CONFIG_8139_OLD_RX_RESET=n - FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/8139too.ko AUTOLOAD:=$(call AutoLoad,50,8139too) endef @@ -183,7 +183,7 @@ define KernelPackage/r8169 KCONFIG:=CONFIG_R8169 \ CONFIG_R8169_NAPI=y \ CONFIG_R8169_VLAN=n - FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/r8169.ko AUTOLOAD:=$(call AutoLoad,50,r8169) endef @@ -200,8 +200,8 @@ define KernelPackage/ne2k-pci DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_NE2K_PCI FILES:= \ - $(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/8390.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/ne2k-pci.ko \ + $(LINUX_DIR)/drivers/net/8390.ko AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci) endef @@ -217,7 +217,7 @@ define KernelPackage/e100 TITLE:=Intel(R) PRO/100+ cards kernel support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_E100 - FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/e100.ko AUTOLOAD:=$(call AutoLoad,50,e100) endef @@ -235,7 +235,7 @@ define KernelPackage/e1000 KCONFIG:=CONFIG_E1000 \ CONFIG_E1000_DISABLE_PACKET_SPLIT=n \ CONFIG_E1000_NAPI=y - FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.ko AUTOLOAD:=$(call AutoLoad,50,e1000) endef @@ -251,7 +251,7 @@ define KernelPackage/e1000e TITLE:=Intel(R) PRO/1000 PCIe cards kernel support DEPENDS:=@PCIE_SUPPORT KCONFIG:=CONFIG_E1000E - FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.ko AUTOLOAD:=$(call AutoLoad,50,e1000e) endef @@ -264,7 +264,7 @@ $(eval $(call KernelPackage,e1000e)) define KernelPackage/b44 TITLE:=Broadcom 44xx driver - FILES:=$(LINUX_DIR)/drivers/net/b44.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/b44.ko KCONFIG:=CONFIG_B44 DEPENDS:=@TARGET_x86 +kmod-ssb SUBMENU:=$(NETWORK_DEVICES_MENU) @@ -283,7 +283,7 @@ define KernelPackage/3c59x TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_VORTEX - FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/3c59x.ko AUTOLOAD:=$(call AutoLoad,50,3c59x) endef @@ -305,7 +305,7 @@ define KernelPackage/pcnet32 TITLE:=AMD PCnet32 PCI support DEPENDS:=@(TARGET_x86||TARGET_malta) KCONFIG:=CONFIG_PCNET32 - FILES:=$(LINUX_DIR)/drivers/net/pcnet32.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/pcnet32.ko AUTOLOAD:=$(call AutoLoad,50,pcnet32) endef @@ -318,7 +318,7 @@ $(eval $(call KernelPackage,pcnet32)) define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet - FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/tg3.ko KCONFIG:=CONFIG_TIGON3 DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32 SUBMENU:=$(NETWORK_DEVICES_MENU) @@ -350,7 +350,7 @@ define KernelPackage/hfcmulti KCONFIG:=CONFIG_MISDN_HFCMULTI DEPENDS:=+kmod-misdn SUBMENU:=$(NETWORK_DEVICES_MENU) - FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.ko AUTOLOAD:=$(call AutoLoad,31,hfcmulti) endef @@ -374,10 +374,10 @@ define KernelPackage/gigaset CONFIG_GIGASET_UNDOCREQ=y \ CONFIG_GIGASET_I4L=y FILES:= \ - $(LINUX_DIR)/drivers/isdn/gigaset/gigaset.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/gigaset/bas_gigaset.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/gigaset/ser_gigaset.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/gigaset/usb_gigaset.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/isdn/gigaset/gigaset.ko \ + $(LINUX_DIR)/drivers/isdn/gigaset/bas_gigaset.ko \ + $(LINUX_DIR)/drivers/isdn/gigaset/ser_gigaset.ko \ + $(LINUX_DIR)/drivers/isdn/gigaset/usb_gigaset.ko AUTOLOAD:=$(call AutoLoad,50,gigaset bas_gigaset ser_gigaset usb_gigaset) endef @@ -395,7 +395,7 @@ define KernelPackage/macvlan SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=MAC-VLAN support KCONFIG:=CONFIG_MACVLAN - FILES:=$(LINUX_DIR)/drivers/net/macvlan.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/macvlan.ko AUTOLOAD:=$(call AutoLoad,50,macvlan) endef @@ -423,12 +423,12 @@ define KernelPackage/tulip CONFIG_DM9102 \ CONFIG_ULI526X FILES:= \ - $(LINUX_DIR)/drivers/net/tulip/tulip.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/tulip/de2104x.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/tulip/de4x5.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/tulip/dmfe.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/tulip/uli526x.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/tulip/winbond-840.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/tulip/tulip.ko \ + $(LINUX_DIR)/drivers/net/tulip/de2104x.ko \ + $(LINUX_DIR)/drivers/net/tulip/de4x5.ko \ + $(LINUX_DIR)/drivers/net/tulip/dmfe.ko \ + $(LINUX_DIR)/drivers/net/tulip/uli526x.ko \ + $(LINUX_DIR)/drivers/net/tulip/winbond-840.ko AUTOLOAD:=$(call AutoLoad,50,tulip) endef diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 54d2ba4dd5..561286efda 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -14,7 +14,7 @@ define KernelPackage/ipt-core SUBMENU:=$(NF_MENU) TITLE:=Netfilter core KCONFIG:=$(KCONFIG_IPT_CORE) - FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CORE-m))) endef @@ -42,7 +42,7 @@ endef define KernelPackage/ipt-conntrack TITLE:=Basic connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK) - FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,41,$(notdir $(IPT_CONNTRACK-m))) $(call AddDepends/ipt) endef @@ -63,7 +63,7 @@ $(eval $(call KernelPackage,ipt-conntrack)) define KernelPackage/ipt-conntrack-extra TITLE:=Extra connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA) - FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m))) $(call AddDepends/ipt,+kmod-ipt-conntrack) endef @@ -84,7 +84,7 @@ $(eval $(call KernelPackage,ipt-conntrack-extra)) define KernelPackage/ipt-filter TITLE:=Modules for packet content inspection KCONFIG:=$(KCONFIG_IPT_FILTER) - FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) $(call AddDepends/ipt,+kmod-textsearch) endef @@ -102,7 +102,7 @@ $(eval $(call KernelPackage,ipt-filter)) define KernelPackage/ipt-ipopt TITLE:=Modules for matching/changing IP packet options KCONFIG:=$(KCONFIG_IPT_IPOPT) - FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m))) $(call AddDepends/ipt) endef @@ -130,7 +130,7 @@ $(eval $(call KernelPackage,ipt-ipopt)) define KernelPackage/ipt-ipsec TITLE:=Modules for matching IPSec packets KCONFIG:=$(KCONFIG_IPT_IPSEC) - FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m))) $(call AddDepends/ipt) endef @@ -149,7 +149,7 @@ $(eval $(call KernelPackage,ipt-ipsec)) define KernelPackage/ipt-nat TITLE:=Basic NAT targets KCONFIG:=$(KCONFIG_IPT_NAT) - FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m))) $(call AddDepends/ipt,+kmod-ipt-conntrack) endef @@ -166,7 +166,7 @@ $(eval $(call KernelPackage,ipt-nat)) define KernelPackage/ipt-nat-extra TITLE:=Extra NAT targets KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA) - FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT_EXTRA-m))) $(call AddDepends/ipt,+kmod-ipt-nat) endef @@ -185,7 +185,7 @@ $(eval $(call KernelPackage,ipt-nat-extra)) define KernelPackage/ipt-nathelper TITLE:=Basic Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER) - FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER-m))) $(call AddDepends/ipt,+kmod-ipt-nat) endef @@ -204,7 +204,7 @@ $(eval $(call KernelPackage,ipt-nathelper)) define KernelPackage/ipt-nathelper-extra TITLE:=Extra Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA) - FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) $(call AddDepends/ipt,+kmod-ipt-nat +kmod-textsearch) endef @@ -233,8 +233,8 @@ define KernelPackage/ipt-imq CONFIG_IMQ_NUM_DEVS=2 \ CONFIG_NETFILTER_XT_TARGET_IMQ FILES:= \ - $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) \ - $(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + $(LINUX_DIR)/drivers/net/imq.ko \ + $(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,46,$(notdir \ imq \ $(IPT_IMQ-m) \ @@ -252,7 +252,7 @@ $(eval $(call KernelPackage,ipt-imq)) define KernelPackage/ipt-queue TITLE:=Module for user-space packet queueing KCONFIG:=$(KCONFIG_IPT_QUEUE) - FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m))) $(call AddDepends/ipt) endef @@ -269,7 +269,7 @@ $(eval $(call KernelPackage,ipt-queue)) define KernelPackage/ipt-ulog TITLE:=Module for user-space packet logging KCONFIG:=$(KCONFIG_IPT_ULOG) - FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m))) $(call AddDepends/ipt) endef @@ -290,8 +290,8 @@ define KernelPackage/ipt-tproxy CONFIG_NETFILTER_XT_MATCH_SOCKET \ CONFIG_NETFILTER_XT_TARGET_TPROXY FILES:= \ - $(LINUX_DIR)/net/netfilter/nf_tproxy_core.$(LINUX_KMOD_SUFFIX) \ - $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + $(LINUX_DIR)/net/netfilter/nf_tproxy_core.ko \ + $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tproxy_core $(IPT_TPROXY-m))) $(call AddDepends/ipt) endef @@ -306,7 +306,7 @@ $(eval $(call KernelPackage,ipt-tproxy)) define KernelPackage/ipt-iprange TITLE:=Module for matching ip ranges KCONFIG:=$(KCONFIG_IPT_IPRANGE) - FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m))) $(call AddDepends/ipt) endef @@ -323,7 +323,7 @@ $(eval $(call KernelPackage,ipt-iprange)) define KernelPackage/ipt-extra TITLE:=Extra modules KCONFIG:=$(KCONFIG_IPT_EXTRA) - FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m))) $(call AddDepends/ipt) endef @@ -346,7 +346,7 @@ define KernelPackage/ip6tables TITLE:=IPv6 modules DEPENDS:=+kmod-ipv6 KCONFIG:=$(KCONFIG_IPT_IPV6) - FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPT_IPV6-m))) endef @@ -360,11 +360,11 @@ $(eval $(call KernelPackage,ip6tables)) define KernelPackage/arptables SUBMENU:=$(NF_MENU) TITLE:=ARP firewalling modules - FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.ko KCONFIG:=CONFIG_IP_NF_ARPTABLES \ CONFIG_IP_NF_ARPFILTER \ CONFIG_IP_NF_ARP_MANGLE - AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.$(LINUX_KMOD_SUFFIX),%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.ko)))) endef define KernelPackage/arptables/description @@ -377,7 +377,7 @@ $(eval $(call KernelPackage,arptables)) define KernelPackage/ebtables SUBMENU:=$(NF_MENU) TITLE:=Bridge firewalling modules - FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \ $(KCONFIG_EBTABLES) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES-m))) @@ -400,7 +400,7 @@ endef define KernelPackage/ebtables-ipv4 TITLE:=ebtables: IPv4 support - FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=$(KCONFIG_EBTABLES_IP4) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP4-m))) $(call AddDepends/ebtables) @@ -416,7 +416,7 @@ $(eval $(call KernelPackage,ebtables-ipv4)) define KernelPackage/ebtables-ipv6 TITLE:=ebtables: IPv6 support - FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=$(KCONFIG_EBTABLES_IP6) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP6-m))) $(call AddDepends/ebtables) @@ -432,7 +432,7 @@ $(eval $(call KernelPackage,ebtables-ipv6)) define KernelPackage/ebtables-watchers TITLE:=ebtables: watchers support - FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_WATCHERS-m))) $(call AddDepends/ebtables) @@ -450,7 +450,7 @@ define KernelPackage/nfnetlink SUBMENU:=$(NF_MENU) TITLE:=Netlink-based userspace interface DEPENDS:=+kmod-ipt-core - FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink.ko KCONFIG:=CONFIG_NETFILTER_NETLINK AUTOLOAD:=$(call AutoLoad,48,nfnetlink) endef @@ -470,7 +470,7 @@ endef define KernelPackage/nfnetlink-log TITLE:=Netfilter LOG over NFNETLINK interface - FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.ko KCONFIG:=CONFIG_NETFILTER_NETLINK_LOG AUTOLOAD:=$(call AutoLoad,48,nfnetlink_log) $(call AddDepends/nfnetlink) @@ -485,7 +485,7 @@ $(eval $(call KernelPackage,nfnetlink-log)) define KernelPackage/nfnetlink-queue TITLE:=Netfilter QUEUE over NFNETLINK interface - FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.ko KCONFIG:=CONFIG_NETFILTER_NETLINK_QUEUE AUTOLOAD:=$(call AutoLoad,48,nfnetlink_queue) $(call AddDepends/nfnetlink) @@ -500,7 +500,7 @@ $(eval $(call KernelPackage,nfnetlink-queue)) define KernelPackage/nf-conntrack-netlink TITLE:=Connection tracking netlink interface - FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.ko KCONFIG:=CONFIG_NF_CT_NETLINK AUTOLOAD:=$(call AutoLoad,49,nf_conntrack_netlink) $(call AddDepends/nfnetlink,+kmod-ipt-conntrack) diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 0ad636fbdb..bdd0f7516e 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -14,8 +14,8 @@ define KernelPackage/atm CONFIG_ATM \ CONFIG_ATM_BR2684 FILES:= \ - $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/atm/atm.ko \ + $(LINUX_DIR)/net/atm/br2684.ko AUTOLOAD:=$(call AutoLoad,30,atm br2684) endef @@ -31,7 +31,7 @@ define KernelPackage/atmtcp TITLE:=ATM over TCP DEPENDS:=kmod-atm KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y - FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.ko AUTOLOAD:=$(call AutoLoad,40,atmtcp) endef @@ -52,8 +52,8 @@ define KernelPackage/appletalk CONFIG_IPDDP_ENCAP=y \ CONFIG_IPDDP_DECAP=y FILES:= \ - $(LINUX_DIR)/net/appletalk/appletalk.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/appletalk/ipddp.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/appletalk/appletalk.ko \ + $(LINUX_DIR)/drivers/net/appletalk/ipddp.ko AUTOLOAD:=$(call AutoLoad,40,appletalk ipddp) endef @@ -68,7 +68,7 @@ define KernelPackage/bonding SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Ethernet bonding driver KCONFIG:=CONFIG_BONDING - FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.ko AUTOLOAD:=$(call AutoLoad,40,bonding) endef @@ -88,9 +88,9 @@ define KernelPackage/capi CONFIG_ISDN_CAPIFS \ CONFIG_ISDN_CAPI_CAPIFS FILES:= \ - $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \ + $(LINUX_DIR)/drivers/isdn/capi/capifs.ko \ + $(LINUX_DIR)/drivers/isdn/capi/capi.ko AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi) endef @@ -109,9 +109,9 @@ define KernelPackage/misdn CONFIG_MISDN_DSP \ CONFIG_MISDN_L1OIP FILES:= \ - $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/mISDN/l1oip.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.ko \ + $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.ko \ + $(LINUX_DIR)/drivers/isdn/mISDN/l1oip.ko AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip) endef @@ -140,9 +140,9 @@ define KernelPackage/isdn4linux CONFIG_ISDN_X25=y \ CONFIG_ISDN_DIVERSION FILES:= \ - $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/i4l/isdn.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.ko \ + $(LINUX_DIR)/drivers/isdn/i4l/isdn.ko \ + $(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.ko AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert) endef @@ -158,7 +158,7 @@ define KernelPackage/ipip TITLE:=IP-in-IP encapsulation DEPENDS:=+kmod-iptunnel4 KCONFIG:=CONFIG_NET_IPIP - FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/ipip.ko AUTOLOAD:=$(call AutoLoad,32,ipip) endef @@ -182,7 +182,7 @@ define KernelPackage/ipsec CONFIG_NET_KEY \ CONFIG_XFRM_USER \ CONFIG_XFRM_IPCOMP - FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,30,$(notdir $(IPSEC-m))) endef @@ -218,7 +218,7 @@ define KernelPackage/ipsec4 CONFIG_INET_XFRM_MODE_TRANSPORT \ CONFIG_INET_XFRM_MODE_TUNNEL \ CONFIG_INET_XFRM_TUNNEL - FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m))) endef @@ -258,7 +258,7 @@ define KernelPackage/ipsec6 CONFIG_INET6_XFRM_MODE_TRANSPORT \ CONFIG_INET6_XFRM_MODE_TUNNEL \ CONFIG_INET6_XFRM_TUNNEL - FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m))) endef @@ -284,7 +284,7 @@ define KernelPackage/iptunnel4 KCONFIG:= \ CONFIG_NET_IPIP \ CONFIG_INET_TUNNEL - FILES:=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/tunnel4.ko AUTOLOAD:=$(call AutoLoad,31,tunnel4) endef @@ -301,7 +301,7 @@ define KernelPackage/iptunnel6 DEPENDS:= +kmod-ipv6 KCONFIG:= \ CONFIG_INET6_TUNNEL - FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.ko AUTOLOAD:=$(call AutoLoad,31,tunnel6) endef @@ -322,7 +322,7 @@ define KernelPackage/ipv6 CONFIG_IPV6_MROUTE=y \ CONFIG_IPV6_PIMSM_V2=n \ CONFIG_IPV6_SUBTREES=y - FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv6/ipv6.ko AUTOLOAD:=$(call AutoLoad,20,ipv6) endef @@ -338,7 +338,7 @@ define KernelPackage/sit DEPENDS:=+kmod-ipv6 +kmod-iptunnel4 TITLE:=IPv6-in-IPv4 tunnelling KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT - FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv6/sit.ko AUTOLOAD:=$(call AutoLoad,32,sit) endef @@ -355,7 +355,7 @@ define KernelPackage/ip6-tunnel DEPENDS:= +kmod-ipv6 +kmod-iptunnel6 KCONFIG:= CONFIG_IPV6_TUNNEL FILES:= $(foreach mod,ip6_tunnel, \ - $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/ipv6/$(mod).ko \ ) AUTOLOAD:=$(call AutoLoad,32,ip6_tunnel) endef @@ -371,7 +371,7 @@ define KernelPackage/gre SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=GRE support KCONFIG:=CONFIG_NET_IPGRE - FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) + FILES=$(LINUX_DIR)/net/ipv4/ip_gre.ko endef define KernelPackage/gre/description @@ -385,7 +385,7 @@ define KernelPackage/tun SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Universal TUN/TAP driver KCONFIG:=CONFIG_TUN - FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/tun.ko AUTOLOAD:=$(call AutoLoad,30,tun) endef @@ -405,9 +405,9 @@ define KernelPackage/ppp CONFIG_PPP_ASYNC \ CONFIG_SLHC FILES:= \ - $(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/slhc.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/ppp_async.ko \ + $(LINUX_DIR)/drivers/net/ppp_generic.ko \ + $(LINUX_DIR)/drivers/net/slhc.ko AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async) endef @@ -423,7 +423,7 @@ define KernelPackage/ppp-synctty TITLE:=PPP sync tty support DEPENDS:=kmod-ppp KCONFIG:=CONFIG_PPP_SYNC_TTY - FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko AUTOLOAD:=$(call AutoLoad,40,ppp_synctty) endef @@ -440,8 +440,8 @@ define KernelPackage/pppoe DEPENDS:=kmod-ppp KCONFIG:=CONFIG_PPPOE FILES:= \ - $(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/pppoe.ko \ + $(LINUX_DIR)/drivers/net/pppox.ko AUTOLOAD:=$(call AutoLoad,40,pppox pppoe) endef @@ -457,7 +457,7 @@ define KernelPackage/pppoa TITLE:=PPPoA support DEPENDS:=kmod-ppp +kmod-atm KCONFIG:=CONFIG_PPPOATM CONFIG_ATM_DRIVERS=y - FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/atm/pppoatm.ko AUTOLOAD:=$(call AutoLoad,40,pppoatm) endef @@ -472,7 +472,7 @@ define KernelPackage/pppol2tp TITLE:=PPPoL2TP support DEPENDS:=kmod-ppp +kmod-pppoe KCONFIG:=CONFIG_PPPOL2TP - FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko AUTOLOAD:=$(call AutoLoad,40,pppol2tp) endef @@ -488,7 +488,7 @@ define KernelPackage/ipoa TITLE:=IPoA support DEPENDS:=kmod-atm KCONFIG:=CONFIG_ATM_CLIP - FILES:=$(LINUX_DIR)/net/atm/clip.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/atm/clip.ko AUTOLOAD:=$(call AutoLoad,40,clip) endef @@ -506,7 +506,7 @@ define KernelPackage/mppe KCONFIG:= \ CONFIG_PPP_MPPE_MPPC \ CONFIG_PPP_MPPE - FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko AUTOLOAD:=$(call AutoLoad,31,ppp_mppe) endef @@ -552,7 +552,7 @@ define KernelPackage/sched CONFIG_NET_EMATCH_U32 \ CONFIG_NET_EMATCH_META \ CONFIG_NET_EMATCH_TEXT - FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/sched/*.ko endef define KernelPackage/sched/description @@ -569,8 +569,8 @@ define KernelPackage/ax25 CONFIG_AX25 \ CONFIG_MKISS FILES:= \ - $(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ax25/ax25.ko \ + $(LINUX_DIR)/drivers/net/hamradio/mkiss.ko AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss) $(call AddDepends/crc16) endef @@ -591,10 +591,10 @@ define KernelPackage/mp-alg CONFIG_IP_ROUTE_MULTIPATH_WRANDOM \ CONFIG_IP_ROUTE_MULTIPATH_DRR FILES:= \ - $(LINUX_DIR)/net/ipv4/multipath_rr.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ipv4/multipath_random.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ipv4/multipath_wrandom.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/ipv4/multipath_drr.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ipv4/multipath_rr.ko \ + $(LINUX_DIR)/net/ipv4/multipath_random.ko \ + $(LINUX_DIR)/net/ipv4/multipath_wrandom.ko \ + $(LINUX_DIR)/net/ipv4/multipath_drr.ko AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr) endef @@ -613,7 +613,7 @@ define KernelPackage/pktgen SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Network packet generator KCONFIG:=CONFIG_NET_PKTGEN - FILES:=$(LINUX_DIR)/net/core/pktgen.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/core/pktgen.ko AUTOLOAD:=$(call AutoLoad,99,pktgen) endef diff --git a/package/kernel/modules/nls.mk b/package/kernel/modules/nls.mk index 7c4f20353b..5b9565dac9 100644 --- a/package/kernel/modules/nls.mk +++ b/package/kernel/modules/nls.mk @@ -13,7 +13,7 @@ define KernelPackage/nls-base SUBMENU:=Native Language Support TITLE:=Native Language Support KCONFIG:=CONFIG_NLS - FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_base.ko AUTOLOAD:=$(call AutoLoad,20,nls_base,1) endef @@ -28,7 +28,7 @@ define KernelPackage/nls-cp437 SUBMENU:=Native Language Support TITLE:=Codepage 437 (United States, Canada) KCONFIG:=CONFIG_NLS_CODEPAGE_437 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp437) $(call AddDepends/nls) endef @@ -44,7 +44,7 @@ define KernelPackage/nls-cp775 SUBMENU:=Native Language Support TITLE:=Codepage 775 (Baltic Rim) KCONFIG:=CONFIG_NLS_CODEPAGE_775 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp775) $(call AddDepends/nls) endef @@ -60,7 +60,7 @@ define KernelPackage/nls-cp850 SUBMENU:=Native Language Support TITLE:=Codepage 850 (Europe) KCONFIG:=CONFIG_NLS_CODEPAGE_850 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp850) $(call AddDepends/nls) endef @@ -76,7 +76,7 @@ define KernelPackage/nls-cp852 SUBMENU:=Native Language Support TITLE:=Codepage 852 (Europe) KCONFIG:=CONFIG_NLS_CODEPAGE_852 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp852) $(call AddDepends/nls) endef @@ -92,7 +92,7 @@ define KernelPackage/nls-cp866 SUBMENU:=Native Language Support TITLE:=Codepage 866 (Cyrillic) KCONFIG:=CONFIG_NLS_CODEPAGE_866 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp866) $(call AddDepends/nls) endef @@ -108,7 +108,7 @@ define KernelPackage/nls-cp1250 SUBMENU:=Native Language Support TITLE:=Codepage 1250 (Eastern Europe) KCONFIG:=CONFIG_NLS_CODEPAGE_1250 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp1250) $(call AddDepends/nls) endef @@ -124,7 +124,7 @@ define KernelPackage/nls-cp1251 SUBMENU:=Native Language Support TITLE:=Codepage 1251 (Russian) KCONFIG:=CONFIG_NLS_CODEPAGE_1251 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.ko AUTOLOAD:=$(call AutoLoad,25,nls_cp1251) $(call AddDepends/nls) endef @@ -140,7 +140,7 @@ define KernelPackage/nls-iso8859-1 SUBMENU:=Native Language Support TITLE:=ISO 8859-1 (Latin 1; Western European Languages) KCONFIG:=CONFIG_NLS_ISO8859_1 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.ko AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1) $(call AddDepends/nls) endef @@ -156,7 +156,7 @@ define KernelPackage/nls-iso8859-2 SUBMENU:=Native Language Support TITLE:=ISO 8859-2 (Latin 2; Central European Languages) KCONFIG:=CONFIG_NLS_ISO8859_2 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.ko AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2) $(call AddDepends/nls) endef @@ -172,7 +172,7 @@ define KernelPackage/nls-iso8859-13 SUBMENU:=Native Language Support TITLE:=ISO 8859-13 (Latin 7; Baltic) KCONFIG:=CONFIG_NLS_ISO8859_13 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.ko AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-13) $(call AddDepends/nls) endef @@ -188,7 +188,7 @@ define KernelPackage/nls-iso8859-15 SUBMENU:=Native Language Support TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol) KCONFIG:=CONFIG_NLS_ISO8859_15 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.ko AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15) $(call AddDepends/nls) endef @@ -204,7 +204,7 @@ define KernelPackage/nls-koi8r SUBMENU:=Native Language Support TITLE:=KOI8-R (Russian) KCONFIG:=CONFIG_NLS_KOI8_R - FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.ko AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r) $(call AddDepends/nls) endef @@ -220,7 +220,7 @@ define KernelPackage/nls-utf8 SUBMENU:=Native Language Support TITLE:=UTF-8 KCONFIG:=CONFIG_NLS_UTF8 - FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.ko AUTOLOAD:=$(call AutoLoad,25,nls_utf8) $(call AddDepends/nls) endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 08d284270f..3781cbe329 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -36,14 +36,14 @@ define KernelPackage/bluetooth $(call AddDepends/hid) $(call AddDepends/rfkill) 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) + $(LINUX_DIR)/net/bluetooth/bluetooth.ko \ + $(LINUX_DIR)/net/bluetooth/l2cap.ko \ + $(LINUX_DIR)/net/bluetooth/sco.ko \ + $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.ko \ + $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ + $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ + $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ + $(LINUX_DIR)/drivers/bluetooth/btusb.ko AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) endef @@ -58,7 +58,7 @@ define KernelPackage/crc-ccitt SUBMENU:=$(OTHER_MENU) TITLE:=CRC-CCITT support KCONFIG:=CONFIG_CRC_CCITT - FILES:=$(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko AUTOLOAD:=$(call AutoLoad,20,crc-ccitt) endef @@ -73,7 +73,7 @@ define KernelPackage/crc-itu-t SUBMENU:=$(OTHER_MENU) TITLE:=CRC ITU-T V.41 support KCONFIG:=CONFIG_CRC_ITU_T - FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/lib/crc-itu-t.ko AUTOLOAD:=$(call AutoLoad,20,crc-itu-t) endef @@ -88,7 +88,7 @@ define KernelPackage/crc7 SUBMENU:=$(OTHER_MENU) TITLE:=CRC7 support KCONFIG:=CONFIG_CRC7 - FILES:=$(LINUX_DIR)/lib/crc7.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/lib/crc7.ko AUTOLOAD:=$(call AutoLoad,20,crc7) endef @@ -103,7 +103,7 @@ define KernelPackage/crc16 SUBMENU:=$(OTHER_MENU) TITLE:=CRC16 support KCONFIG:=CONFIG_CRC16 - FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/lib/crc16.ko AUTOLOAD:=$(call AutoLoad,20,crc16,1) $(call SetDepends/crc16) endef @@ -119,7 +119,7 @@ define KernelPackage/eeprom-93cx6 SUBMENU:=$(OTHER_MENU) TITLE:=EEPROM 93CX6 support KCONFIG:=CONFIG_EEPROM_93CX6 - FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.ko AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6) endef @@ -135,7 +135,7 @@ define KernelPackage/gpio-cs5535 TITLE:=AMD CS5535/CS5536 GPIO driver DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_CS5535_GPIO - FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.ko AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio) endef @@ -151,7 +151,7 @@ define KernelPackage/gpio-dev TITLE:=Generic GPIO char device support DEPENDS:=@GPIO_SUPPORT KCONFIG:=CONFIG_GPIO_DEVICE - FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.ko AUTOLOAD:=$(call AutoLoad,40,gpio_dev) endef @@ -167,7 +167,7 @@ define KernelPackage/gpio-nsc TITLE:=Natsemi GPIO support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_NSC_GPIO - FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.ko AUTOLOAD:=$(call AutoLoad,40,nsc_gpio) endef @@ -183,7 +183,7 @@ define KernelPackage/gpio-pc8736x TITLE:=PC8736x GPIO support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_PC8736x_GPIO - FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.ko AUTOLOAD:=$(call AutoLoad,40,pc8736x_gpio) endef @@ -199,7 +199,7 @@ define KernelPackage/gpio-scx200 TITLE:=Natsemi SCX200 GPIO support DEPENDS:=@TARGET_x86 +kmod-gpio-nsc KCONFIG:=CONFIG_SCx200_GPIO - FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.ko AUTOLOAD:=$(call AutoLoad,50,scx200_gpio) endef @@ -214,7 +214,7 @@ define KernelPackage/gpio-nxp-74hc164 TITLE:=NXP 74HC164 GPIO expander support DEPENDS:=@TARGET_brcm63xx KCONFIG:=CONFIG_GPIO_NXP_74HC164 - FILES:=$(LINUX_DIR)/drivers/gpio/nxp_74hc164.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/gpio/nxp_74hc164.ko AUTOLOAD:=$(call AutoLoad,99,nxp_74hc164) endef @@ -229,7 +229,7 @@ define KernelPackage/hid TITLE:=HID Devices DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_HID - FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/hid/hid.ko AUTOLOAD:=$(call AutoLoad,61,hid) $(call SetDepends/hid) $(call AddDepends/input) @@ -247,7 +247,7 @@ define KernelPackage/input-core TITLE:=Input device core KCONFIG:=CONFIG_INPUT $(call SetDepends/input) - FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/input-core.ko AUTOLOAD:=$(call AutoLoad,19,input-core) endef @@ -262,7 +262,7 @@ define KernelPackage/input-evdev SUBMENU:=$(OTHER_MENU) TITLE:=Input event device KCONFIG:=CONFIG_INPUT_EVDEV - FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/evdev.ko AUTOLOAD:=$(call AutoLoad,60,evdev) $(call AddDepends/input) endef @@ -281,7 +281,7 @@ define KernelPackage/input-gpio-buttons KCONFIG:= \ CONFIG_INPUT_GPIO_BUTTONS \ CONFIG_INPUT_MISC=y - FILES:=$(LINUX_DIR)/drivers/input/misc/gpio_buttons.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/misc/gpio_buttons.ko AUTOLOAD:=$(call AutoLoad,62,gpio_buttons) endef @@ -297,7 +297,7 @@ define KernelPackage/input-gpio-keys TITLE:=GPIO key support DEPENDS:= @GPIO_SUPPORT KCONFIG:=CONFIG_KEYBOARD_GPIO - FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko AUTOLOAD:=$(call AutoLoad,60,gpio_keys) $(call AddDepends/input) endef @@ -314,7 +314,7 @@ define KernelPackage/input-gpio-encoder SUBMENU:=$(OTHER_MENU) TITLE:=GPIO rotay encoder KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER - FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko AUTOLOAD:=$(call AutoLoad,62,rotary_encoder) $(call AddDepends/input,@GPIO_SUPPORT) endef @@ -330,7 +330,7 @@ define KernelPackage/input-joydev SUBMENU:=$(OTHER_MENU) TITLE:=Joystick device support KCONFIG:=CONFIG_INPUT_JOYDEV - FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/joydev.ko AUTOLOAD:=$(call AutoLoad,62,joydev) $(call AddDepends/input) endef @@ -346,7 +346,7 @@ define KernelPackage/input-polldev SUBMENU:=$(OTHER_MENU) TITLE:=Polled Input device support KCONFIG:=CONFIG_INPUT_POLLDEV - FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko AUTOLOAD:=$(call AutoLoad,20,input-polldev) $(call AddDepends/input) endef @@ -363,7 +363,7 @@ define KernelPackage/leds-alix TITLE:=PCengines ALIX LED support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_LEDS_ALIX2 - FILES:=$(LINUX_DIR)/drivers/leds/leds-alix2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-alix2.ko AUTOLOAD:=$(call AutoLoad,50,leds-alix2) endef @@ -379,7 +379,7 @@ define KernelPackage/leds-gpio TITLE:=GPIO LED support DEPENDS:= @GPIO_SUPPORT KCONFIG:=CONFIG_LEDS_GPIO - FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.ko AUTOLOAD:=$(call AutoLoad,60,leds-gpio) endef @@ -395,7 +395,7 @@ define KernelPackage/leds-net48xx TITLE:=Soekris Net48xx LED support DEPENDS:=@TARGET_x86 +kmod-gpio-scx200 KCONFIG:=CONFIG_LEDS_NET48XX - FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.ko AUTOLOAD:=$(call AutoLoad,50,leds-net48xx) endef @@ -411,7 +411,7 @@ define KernelPackage/leds-rb750 TITLE:=RouterBOARD 750 LED support DEPENDS:=@TARGET_ar71xx KCONFIG:=CONFIG_LEDS_RB750 - FILES:=$(LINUX_DIR)/drivers/leds/leds-rb750.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-rb750.ko AUTOLOAD:=$(call AutoLoad,60,leds-rb750) endef @@ -427,7 +427,7 @@ define KernelPackage/leds-wndr3700-usb TITLE:=WNDR3700 USB LED support DEPENDS:=@TARGET_ar71xx KCONFIG:=CONFIG_LEDS_WNDR3700_USB - FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.ko AUTOLOAD:=$(call AutoLoad,60,leds-wndr3700-usb) endef @@ -443,7 +443,7 @@ define KernelPackage/leds-wrap TITLE:=PCengines WRAP LED support DEPENDS:=@TARGET_x86 +kmod-gpio-scx200 KCONFIG:=CONFIG_LEDS_WRAP - FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.ko AUTOLOAD:=$(call AutoLoad,50,leds-wrap) endef @@ -458,7 +458,7 @@ define KernelPackage/ledtrig-morse SUBMENU:=$(OTHER_MENU) TITLE:=LED Morse Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE - FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse) endef @@ -473,7 +473,7 @@ define KernelPackage/ledtrig-netdev SUBMENU:=$(OTHER_MENU) TITLE:=LED NETDEV Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV - FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev) endef @@ -493,9 +493,9 @@ define KernelPackage/lp CONFIG_PRINTER \ CONFIG_PPDEV FILES:= \ - $(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/parport/parport.ko \ + $(LINUX_DIR)/drivers/char/lp.ko \ + $(LINUX_DIR)/drivers/char/ppdev.ko AUTOLOAD:=$(call AutoLoad,50,parport lp) endef @@ -516,8 +516,8 @@ define KernelPackage/mmc CONFIG_MMC_WBSD=n \ CONFIG_SDIO_UART=n FILES:= \ - $(LINUX_DIR)/drivers/mmc/core/mmc_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/mmc/card/mmc_block.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/mmc/core/mmc_core.ko \ + $(LINUX_DIR)/drivers/mmc/card/mmc_block.ko AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block,1) endef @@ -533,7 +533,7 @@ define KernelPackage/mmc-atmelmci TITLE:=Amtel MMC Support DEPENDS:=@TARGET_avr32 +kmod-mmc KCONFIG:=CONFIG_MMC_ATMELMCI - FILES:=$(LINUX_DIR)/drivers/mmc/host/atmel-mci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/mmc/host/atmel-mci.ko AUTOLOAD:=$(call AutoLoad,90,atmel-mci) endef @@ -553,12 +553,12 @@ define KernelPackage/rfkill CONFIG_RFKILL_LEDS=y ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1) FILES:= \ - $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/rfkill/rfkill.ko AUTOLOAD:=$(call AutoLoad,20,rfkill) else FILES:= \ - $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/rfkill/rfkill.ko \ + $(LINUX_DIR)/net/rfkill/rfkill-input.ko AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) endif $(call SetDepends/rfkill) @@ -576,7 +576,7 @@ define KernelPackage/softdog SUBMENU:=$(OTHER_MENU) TITLE:=Software watchdog driver KCONFIG:=CONFIG_SOFT_WATCHDOG - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.ko AUTOLOAD:=$(call AutoLoad,50,softdog) endef @@ -602,7 +602,7 @@ define KernelPackage/ssb CONFIG_SSB_POSSIBLE=y \ CONFIG_SSB_SPROM=y \ CONFIG_SSB_SILENT=y - FILES:=$(LINUX_DIR)/drivers/ssb/ssb.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ssb/ssb.ko AUTOLOAD:=$(call AutoLoad,29,ssb) endef @@ -622,9 +622,9 @@ SUBMENU:=$(OTHER_MENU) CONFIG_TEXTSEARCH_BM \ CONFIG_TEXTSEARCH_FSM FILES:= \ - $(LINUX_DIR)/lib/ts_kmp.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/lib/ts_bm.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/lib/ts_fsm.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/lib/ts_kmp.ko \ + $(LINUX_DIR)/lib/ts_bm.ko \ + $(LINUX_DIR)/lib/ts_fsm.ko AUTOLOAD:=$(call AutoLoad,20,ts_kmp ts_bm ts_fsm) endef @@ -636,7 +636,7 @@ define KernelPackage/wdt-geode TITLE:=Geode/LX Watchdog timer DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_GEODE_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.ko AUTOLOAD:=$(call AutoLoad,50,geodewdt) endef @@ -652,7 +652,7 @@ define KernelPackage/wdt-sc520 TITLE:=Natsemi SC520 Watchdog support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_SC520_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sc520_wdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sc520_wdt.ko AUTOLOAD:=$(call AutoLoad,50,sc520_wdt) endef @@ -668,7 +668,7 @@ define KernelPackage/wdt-scx200 TITLE:=Natsemi SCX200 Watchdog support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_SCx200_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.ko AUTOLOAD:=$(call AutoLoad,50,scx200_wdt) endef @@ -684,7 +684,7 @@ define KernelPackage/pwm-gpio TITLE:=PWM over GPIO KCONFIG:=CONFIG_GENERIC_PWM \ CONFIG_GPIO_PWM - FILES:=$(LINUX_DIR)/drivers/pwm/gpio-pwm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/pwm/gpio-pwm.ko AUTOLOAD:=$(call AutoLoad,51,gpio-pwm) endef diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index 1c01a04fe8..9dee29817e 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -23,9 +23,9 @@ define KernelPackage/pcmcia-core/2.4 # CONFIG_PCMCIA \ # CONFIG_CARDBUS FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \ + $(LINUX_DIR)/drivers/pcmcia/ds.ko \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket) endef @@ -35,8 +35,8 @@ define KernelPackage/pcmcia-core/2.6 # CONFIG_PCMCIA \ # PCMCIA_DEBUG=n FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \ + $(LINUX_DIR)/drivers/pcmcia/pcmcia.ko AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia) endef @@ -56,13 +56,13 @@ define KernelPackage/pcmcia-yenta CONFIG_YENTA ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket) else FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.ko \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket) endif endef @@ -82,12 +82,12 @@ endef define KernelPackage/pcmcia-serial/2.4 # KCONFIG:=CONFIG_PCMCIA_SERIAL_CS - FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.ko endef define KernelPackage/pcmcia-serial/2.6 # KCONFIG:=CONFIG_SERIAL_8250_CS - FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.ko endef define KernelPackage/pcmcia-serial/description diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index f925ebce75..8c0ce65d51 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -11,7 +11,7 @@ define KernelPackage/pcspkr SUBMENU:=$(SOUND_MENU) TITLE:=PC speaker support KCONFIG:=CONFIG_INPUT_PCSPKR - FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko AUTOLOAD:=$(call AutoLoad,50,pcspkr) endef @@ -45,7 +45,7 @@ define KernelPackage/sound-core endef define KernelPackage/sound-core/2.4 - FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/sound/soundcore.ko AUTOLOAD:=$(call AutoLoad,30,soundcore) endef @@ -63,16 +63,16 @@ SOUNDCORE_LOAD ?= \ snd-pcm-oss SOUNDCORE_FILES ?= \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/seq/snd-seq-device.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/sound/soundcore.ko \ + $(LINUX_DIR)/sound/core/snd.ko \ + $(LINUX_DIR)/sound/core/snd-page-alloc.ko \ + $(LINUX_DIR)/sound/core/snd-hwdep.ko \ + $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko \ + $(LINUX_DIR)/sound/core/snd-rawmidi.ko \ + $(LINUX_DIR)/sound/core/snd-timer.ko \ + $(LINUX_DIR)/sound/core/snd-pcm.ko \ + $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \ + $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko define KernelPackage/sound-core/2.6 FILES:=$(SOUNDCORE_FILES) @@ -81,8 +81,8 @@ endef define KernelPackage/sound-core/uml FILES:= \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/sound/soundcore.ko \ + $(LINUX_DIR)/arch/um/drivers/hostaudio.ko AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio) endef @@ -102,7 +102,7 @@ endef define KernelPackage/sound-i8x0 TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller KCONFIG:=CONFIG_SND_INTEL8X0 - FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.ko AUTOLOAD:=$(call AutoLoad,35,snd-i8x0) $(call AddDepends/sound) endef @@ -119,9 +119,9 @@ $(eval $(call KernelPackage,sound-i8x0)) define KernelPackage/sound-cs5535audio TITLE:=CS5535 PCI Controller KCONFIG:=CONFIG_SND_CS5535AUDIO - FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/ac97_bus.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko \ + $(LINUX_DIR)/sound/ac97_bus.ko \ + $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio) $(call AddDepends/sound) endef diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk index ccba3c2b43..27f5c0eded 100644 --- a/package/kernel/modules/spi.mk +++ b/package/kernel/modules/spi.mk @@ -14,7 +14,7 @@ define KernelPackage/mmc-spi KCONFIG:=CONFIG_MMC_SPI \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y - FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.ko AUTOLOAD:=$(call AutoLoad,90,mmc_spi) endef @@ -31,7 +31,7 @@ define KernelPackage/spi-bitbang KCONFIG:=CONFIG_SPI_BITBANG \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y - FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.ko AUTOLOAD:=$(call AutoLoad,91,spi_bitbang) endef @@ -47,7 +47,7 @@ define KernelPackage/spi-gpio-old TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED) DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang KCONFIG:=CONFIG_SPI_GPIO_OLD - FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.ko AUTOLOAD:=$(call AutoLoad,92,spi_gpio_old) endef @@ -62,7 +62,7 @@ define KernelPackage/spi-gpio TITLE:=GPIO-based bitbanging SPI Master DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang KCONFIG:=CONFIG_SPI_GPIO - FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.ko AUTOLOAD:=$(call AutoLoad,92,spi_gpio) endef @@ -78,7 +78,7 @@ define KernelPackage/spi-dev KCONFIG:=CONFIG_SPI_SPIDEV \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y - FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/spi/spidev.ko AUTOLOAD:=$(call AutoLoad,93,spidev) endef @@ -94,7 +94,7 @@ define KernelPackage/spi-vsc7385 TITLE:=Vitesse VSC7385 ethernet switch driver DEPENDS:=@TARGET_ar71xx KCONFIG:=CONFIG_SPI_VSC7385 - FILES:=$(LINUX_DIR)/drivers/spi/spi_vsc7385.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/spi/spi_vsc7385.ko AUTOLOAD:=$(call AutoLoad,93,spi_vsc7385) endef diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 4790ff9774..89b00e3f3e 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -16,7 +16,7 @@ define KernelPackage/usb-core TITLE:=Support for USB DEPENDS:=@USB_SUPPORT +kmod-nls-base KCONFIG:=CONFIG_USB - FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko AUTOLOAD:=$(call AutoLoad,20,usbcore,1) endef @@ -75,7 +75,7 @@ define KernelPackage/usb-isp116x-hcd CONFIG_USB_ISP116X_HCD \ CONFIG_USB_ISP116X_HCD_OF=y \ CONFIG_USB_ISP116X_HCD_PLATFORM=n - FILES:=$(LINUX_DIR)/drivers/usb/host/isp116x-hcd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/host/isp116x-hcd.ko AUTOLOAD:=$(call AutoLoad,50,isp116x-hcd) $(call AddDepends/usb) endef @@ -91,7 +91,7 @@ define KernelPackage/usb2 TITLE:=Support for USB2 controllers KCONFIG:=CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_AR71XX=y - FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1) $(call AddDepends/usb) endef @@ -163,7 +163,7 @@ $(eval $(call KernelPackage,usb-printer)) define KernelPackage/usb-serial TITLE:=Support for USB-to-Serial converters KCONFIG:=CONFIG_USB_SERIAL - FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.ko AUTOLOAD:=$(call AutoLoad,60,usbserial) $(call AddDepends/usb) endef @@ -184,7 +184,7 @@ endef define KernelPackage/usb-serial-airprime TITLE:=Support for Airprime (EVDO) KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME - FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.ko AUTOLOAD:=$(call AutoLoad,65,airprime) $(call AddDepends/usb-serial) endef @@ -199,7 +199,7 @@ $(eval $(call KernelPackage,usb-serial-airprime)) define KernelPackage/usb-serial-belkin TITLE:=Support for Belkin devices KCONFIG:=CONFIG_USB_SERIAL_BELKIN - FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.ko AUTOLOAD:=$(call AutoLoad,65,belkin_sa) $(call AddDepends/usb-serial) endef @@ -214,7 +214,7 @@ $(eval $(call KernelPackage,usb-serial-belkin)) define KernelPackage/usb-serial-ch341 TITLE:=Support for CH341 devices KCONFIG:=CONFIG_USB_SERIAL_CH341 - FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.ko AUTOLOAD:=$(call AutoLoad,65,ch341) $(call AddDepends/usb-serial) endef @@ -229,7 +229,7 @@ $(eval $(call KernelPackage,usb-serial-ch341)) define KernelPackage/usb-serial-ftdi TITLE:=Support for FTDI devices KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO - FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.ko AUTOLOAD:=$(call AutoLoad,65,ftdi_sio) $(call AddDepends/usb-serial) endef @@ -244,7 +244,7 @@ $(eval $(call KernelPackage,usb-serial-ftdi)) define KernelPackage/usb-serial-mct TITLE:=Support for Magic Control Tech. devices KCONFIG:=CONFIG_USB_SERIAL_MCT_U232 - FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.ko AUTOLOAD:=$(call AutoLoad,65,mct_u232) $(call AddDepends/usb-serial) endef @@ -259,7 +259,7 @@ $(eval $(call KernelPackage,usb-serial-mct)) define KernelPackage/usb-serial-pl2303 TITLE:=Support for Prolific PL2303 devices KCONFIG:=CONFIG_USB_SERIAL_PL2303 - FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.ko AUTOLOAD:=$(call AutoLoad,65,pl2303) $(call AddDepends/usb-serial) endef @@ -274,7 +274,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303)) define KernelPackage/usb-serial-cp210x TITLE:=Support for Silicon Labs cp210x devices KCONFIG:=CONFIG_USB_SERIAL_CP210X - FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.ko AUTOLOAD:=$(call AutoLoad,65,cp210x) $(call AddDepends/usb-serial) endef @@ -289,7 +289,7 @@ $(eval $(call KernelPackage,usb-serial-cp210x)) define KernelPackage/usb-serial-ark3116 TITLE:=Support for ArkMicroChips ARK3116 devices KCONFIG:=CONFIG_USB_SERIAL_ARK3116 - FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.ko AUTOLOAD:=$(call AutoLoad,65,ark3116) $(call AddDepends/usb-serial) endef @@ -304,7 +304,7 @@ $(eval $(call KernelPackage,usb-serial-ark3116)) define KernelPackage/usb-serial-oti6858 TITLE:=Support for Ours Technology OTI6858 devices KCONFIG:=CONFIG_USB_SERIAL_OTI6858 - FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.ko AUTOLOAD:=$(call AutoLoad,65,oti6858) $(call AddDepends/usb-serial) endef @@ -319,7 +319,7 @@ $(eval $(call KernelPackage,usb-serial-oti6858)) define KernelPackage/usb-serial-sierrawireless TITLE:=Support for Sierra Wireless devices KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS - FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.ko AUTOLOAD:=$(call AutoLoad,65,sierra) $(call AddDepends/usb-serial) endef @@ -334,7 +334,7 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless)) define KernelPackage/usb-serial-motorola-phone TITLE:=Support for Motorola usb phone KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA - FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.ko AUTOLOAD:=$(call AutoLoad,65,moto_modem) $(call AddDepends/usb-serial) endef @@ -349,7 +349,7 @@ $(eval $(call KernelPackage,usb-serial-motorola-phone)) define KernelPackage/usb-serial-visor TITLE:=Support for Handspring Visor devices KCONFIG:=CONFIG_USB_SERIAL_VISOR - FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.ko AUTOLOAD:=$(call AutoLoad,65,visor) $(call AddDepends/usb-serial) endef @@ -364,7 +364,7 @@ $(eval $(call KernelPackage,usb-serial-visor)) define KernelPackage/usb-serial-cypress-m8 TITLE:=Support for CypressM8 USB-Serial KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8 - FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.ko AUTOLOAD:=$(call AutoLoad,65,cypress_m8) $(call AddDepends/usb-serial) endef @@ -395,7 +395,7 @@ define KernelPackage/usb-serial-keyspan CONFIG_USB_SERIAL_KEYSPAN_MPR \ CONFIG_USB_SERIAL_KEYSPAN_USA49W \ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC - FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.ko AUTOLOAD:=$(call AutoLoad,65,keyspan) $(call AddDepends/usb-serial) endef @@ -410,7 +410,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-option TITLE:=Support for Option HSDPA modems KCONFIG:=CONFIG_USB_SERIAL_OPTION - FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko AUTOLOAD:=$(call AutoLoad,65,option) $(call AddDepends/usb-serial) endef @@ -426,7 +426,7 @@ define KernelPackage/usb-storage TITLE:=USB Storage support DEPENDS:= +!TARGET_x86:kmod-scsi-core KCONFIG:=CONFIG_USB_STORAGE - FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.ko AUTOLOAD:=$(call AutoLoad,60,usb-storage,1) $(call AddDepends/usb) endef @@ -454,16 +454,16 @@ define KernelPackage/usb-storage-extras CONFIG_USB_STORAGE_SDDR55 \ CONFIG_USB_STORAGE_USBAT FILES:= \ - $(LINUX_DIR)/drivers/usb/storage/ums-alauda.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-cypress.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-datafab.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-freecom.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-isd200.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-jumpshot.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-karma.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-sddr09.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-sddr55.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/usb/storage/ums-usbat.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/usb/storage/ums-alauda.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-cypress.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-datafab.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-freecom.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-isd200.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-jumpshot.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-karma.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-sddr09.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-sddr55.ko \ + $(LINUX_DIR)/drivers/usb/storage/ums-usbat.ko AUTOLOAD:=$(call AutoLoad,60,ums-alauda ums-cypress ums-datafab \ ums-freecom ums-isd200 ums-jumpshot \ ums-karma ums-sddr09 ums-sddr55 ums-usbat) @@ -480,7 +480,7 @@ $(eval $(call KernelPackage,usb-storage-extras)) define KernelPackage/usb-video TITLE:=Support for USB video devices KCONFIG:=CONFIG_VIDEO_USBVIDEO - FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.ko AUTOLOAD:=$(call AutoLoad,61,usbvideo) $(call AddDepends/usb) endef @@ -496,7 +496,7 @@ define KernelPackage/usb-atm TITLE:=Support for ATM on USB bus DEPENDS:=+kmod-atm KCONFIG:=CONFIG_USB_ATM - FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.ko AUTOLOAD:=$(call AutoLoad,60,usbatm) $(call AddDepends/usb) endef @@ -517,7 +517,7 @@ endef define KernelPackage/usb-atm-speedtouch TITLE:=SpeedTouch USB ADSL modems support KCONFIG:=CONFIG_USB_SPEEDTOUCH - FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.ko AUTOLOAD:=$(call AutoLoad,70,speedtch) $(call AddDepends/usb-atm) endef @@ -531,7 +531,7 @@ $(eval $(call KernelPackage,usb-atm-speedtouch)) define KernelPackage/usb-atm-ueagle TITLE:=Eagle 8051 based USB ADSL modems support - FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.ko KCONFIG:=CONFIG_USB_UEAGLEATM AUTOLOAD:=$(call AutoLoad,70,ueagle-atm) $(call AddDepends/usb-atm) @@ -546,7 +546,7 @@ $(eval $(call KernelPackage,usb-atm-ueagle)) define KernelPackage/usb-atm-cxacru TITLE:=cxacru - FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.ko KCONFIG:=CONFIG_USB_CXACRU AUTOLOAD:=$(call AutoLoad,70,cxacru) $(call AddDepends/usb-atm) @@ -563,7 +563,7 @@ define KernelPackage/usb-net TITLE:=Kernel modules for USB-to-Ethernet convertors KCONFIG:=CONFIG_USB_USBNET AUTOLOAD:=$(call AutoLoad,60,usbnet) - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko $(call AddDepends/usb) endef @@ -583,7 +583,7 @@ endef define KernelPackage/usb-net-asix TITLE:=Kernel module for USB-to-Ethernet Asix convertors KCONFIG:=CONFIG_USB_NET_AX8817X - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko AUTOLOAD:=$(call AutoLoad,61,asix) $(call AddDepends/usb-net) endef @@ -599,7 +599,7 @@ define KernelPackage/usb-net-hso TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO FILES:= \ - $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.ko AUTOLOAD:=$(call AutoLoad,61,hso) $(call AddDepends/usb-net) $(call AddDepends/rfkill) @@ -615,7 +615,7 @@ $(eval $(call KernelPackage,usb-net-hso)) define KernelPackage/usb-net-kaweth TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors KCONFIG:=CONFIG_USB_KAWETH - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.ko AUTOLOAD:=$(call AutoLoad,61,kaweth) $(call AddDepends/usb-net) endef @@ -630,7 +630,7 @@ $(eval $(call KernelPackage,usb-net-kaweth)) define KernelPackage/usb-net-pegasus TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors KCONFIG:=CONFIG_USB_PEGASUS - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.ko AUTOLOAD:=$(call AutoLoad,61,pegasus) $(call AddDepends/usb-net) endef @@ -645,7 +645,7 @@ $(eval $(call KernelPackage,usb-net-pegasus)) define KernelPackage/usb-net-mcs7830 TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors KCONFIG:=CONFIG_USB_NET_MCS7830 - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.ko AUTOLOAD:=$(call AutoLoad,61,mcs7830) $(call AddDepends/usb-net) endef @@ -660,7 +660,7 @@ $(eval $(call KernelPackage,usb-net-mcs7830)) define KernelPackage/usb-net-dm9601-ether TITLE:=Support for DM9601 ethernet connections KCONFIG:=CONFIG_USB_NET_DM9601 - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.ko AUTOLOAD:=$(call AutoLoad,61,dm9601) $(call AddDepends/usb-net) endef @@ -674,7 +674,7 @@ $(eval $(call KernelPackage,usb-net-dm9601-ether)) define KernelPackage/usb-net-cdc-ether TITLE:=Support for cdc ethernet connections KCONFIG:=CONFIG_USB_NET_CDCETHER - FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.ko AUTOLOAD:=$(call AutoLoad,61,cdc_ether) $(call AddDepends/usb-net) endef @@ -689,7 +689,7 @@ $(eval $(call KernelPackage,usb-net-cdc-ether)) define KernelPackage/usb-net-rndis TITLE:=Support for RNDIS connections KCONFIG:=CONFIG_USB_NET_RNDIS_HOST - FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX) + FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.ko AUTOLOAD:=$(call AutoLoad,62,rndis_host) $(call AddDepends/usb-net,+kmod-usb-net-cdc-ether) endef diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 577d4115f9..92a5205c6f 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -22,15 +22,15 @@ define KernelPackage/video-core endef define KernelPackage/video-core/2.4 - FILES:=$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/videodev.ko AUTOLOAD:=$(call AutoLoad,60,videodev) endef define KernelPackage/video-core/2.6 FILES:= \ - $(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \ + $(LINUX_DIR)/drivers/media/video/v4l1-compat.ko \ + $(LINUX_DIR)/drivers/media/video/videodev.ko AUTOLOAD:=$(call AutoLoad,60, \ v4l1-compat \ videodev \ @@ -55,7 +55,7 @@ define KernelPackage/video-cpia2 TITLE:=CPIA2 video driver DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_VIDEO_CPIA2 - FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.ko AUTOLOAD:=$(call AutoLoad,70,cpia2) $(call AddDepends/video) endef @@ -71,7 +71,7 @@ define KernelPackage/video-konica TITLE:=Konica USB webcam support DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_USB_KONICAWC - FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.ko AUTOLOAD:=$(call AutoLoad,70,konicawc) $(call AddDepends/video) endef @@ -88,7 +88,7 @@ define KernelPackage/video-ov511 $(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=OV511 USB webcam support KCONFIG:=CONFIG_VIDEO_OV511 - FILES:=$(LINUX_DIR)/drivers/media/video/ov511.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/ov511.ko AUTOLOAD:=$(call AutoLoad,70,ov511) $(call AddDepends/video) endef @@ -105,7 +105,7 @@ define KernelPackage/video-ovcamchip $(call AddDepends/video,@USB_SUPPORT +kmod-i2c-core) TITLE:=OV6xxx/OV7xxx Camera Chip support KCONFIG:=CONFIG_VIDEO_OVCAMCHIP - FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.ko AUTOLOAD:=$(call AutoLoad,70,ovcamchip) $(call AddDepends/video) endef @@ -123,7 +123,7 @@ define KernelPackage/video-sn9c102 $(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=SN9C102 Camera Chip support KCONFIG:=CONFIG_USB_SN9C102 - FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.ko AUTOLOAD:=$(call AutoLoad,70,gspca_sn9c20x) $(call AddDepends/video) endef @@ -143,7 +143,7 @@ $(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) KCONFIG:= \ CONFIG_USB_PWC \ CONFIG_USB_PWC_DEBUG=n - FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.ko AUTOLOAD:=$(call AutoLoad,70,pwc) $(call AddDepends/video) endef @@ -159,7 +159,7 @@ define KernelPackage/video-uvc $(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=USB Video Class (UVC) support KCONFIG:= CONFIG_USB_VIDEO_CLASS - FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko AUTOLOAD:=$(call AutoLoad,90,uvcvideo) $(call AddDepends/video) endef @@ -177,7 +177,7 @@ define KernelPackage/video-gspca-core TITLE:=GSPCA webcam core support framework DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_USB_GSPCA - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.ko AUTOLOAD:=$(call AutoLoad,70,gspca_main) $(call AddDepends/video) endef @@ -199,7 +199,7 @@ endef define KernelPackage/video-gspca-conex TITLE:=conex webcam support KCONFIG:=CONFIG_USB_GSPCA_CONEX - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_conex.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_conex.ko AUTOLOAD:=$(call AutoLoad,75,gspca_conex) $(call AddDepends/video-gspca) endef @@ -214,7 +214,7 @@ $(eval $(call KernelPackage,video-gspca-conex)) define KernelPackage/video-gspca-etoms TITLE:=etoms webcam support KCONFIG:=CONFIG_USB_GSPCA_ETOMS - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_etoms.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_etoms.ko AUTOLOAD:=$(call AutoLoad,75,gspca_etoms) $(call AddDepends/video-gspca) endef @@ -229,7 +229,7 @@ $(eval $(call KernelPackage,video-gspca-etoms)) define KernelPackage/video-gspca-finepix TITLE:=finepix webcam support KCONFIG:=CONFIG_USB_GSPCA_FINEPIX - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_finepix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_finepix.ko AUTOLOAD:=$(call AutoLoad,75,gspca_finepix) $(call AddDepends/video-gspca) endef @@ -244,7 +244,7 @@ $(eval $(call KernelPackage,video-gspca-finepix)) define KernelPackage/video-gspca-mars TITLE:=mars webcam support KCONFIG:=CONFIG_USB_GSPCA_MARS - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mars.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mars.ko AUTOLOAD:=$(call AutoLoad,75,gspca_mars) $(call AddDepends/video-gspca) endef @@ -259,7 +259,7 @@ $(eval $(call KernelPackage,video-gspca-mars)) define KernelPackage/video-gspca-mr97310a TITLE:=mr97310a webcam support KCONFIG:=CONFIG_USB_GSPCA_MR97310A - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.ko AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) $(call AddDepends/video-gspca) endef @@ -274,7 +274,7 @@ $(eval $(call KernelPackage,video-gspca-mr97310a)) define KernelPackage/video-gspca-ov519 TITLE:=ov519 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV519 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov519.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov519.ko AUTOLOAD:=$(call AutoLoad,75,gspca_ov519) $(call AddDepends/video-gspca) endef @@ -289,7 +289,7 @@ $(eval $(call KernelPackage,video-gspca-ov519)) define KernelPackage/video-gspca-ov534 TITLE:=ov534 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV534 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.ko AUTOLOAD:=$(call AutoLoad,75,gspca_ov534) $(call AddDepends/video-gspca) endef @@ -304,7 +304,7 @@ $(eval $(call KernelPackage,video-gspca-ov534)) define KernelPackage/video-gspca-pac207 TITLE:=pac207 webcam support KCONFIG:=CONFIG_USB_GSPCA_PAC207 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac207.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac207.ko AUTOLOAD:=$(call AutoLoad,75,gspca_pac207) $(call AddDepends/video-gspca) endef @@ -319,7 +319,7 @@ $(eval $(call KernelPackage,video-gspca-pac207)) define KernelPackage/video-gspca-pac7311 TITLE:=pac7311 webcam support KCONFIG:=CONFIG_USB_GSPCA_PAC7311 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac7311.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac7311.ko AUTOLOAD:=$(call AutoLoad,75,gspca_pac7311) $(call AddDepends/video-gspca) endef @@ -334,7 +334,7 @@ $(eval $(call KernelPackage,video-gspca-pac7311)) define KernelPackage/video-gspca-sn9c20x TITLE:=sn9c20x webcam support KCONFIG:=CONFIG_USB_GSPCA_SN9C20X - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sn9c20x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sn9c20x.ko AUTOLOAD:=$(call AutoLoad,75,sn9c20x) $(call AddDepends/video-gspca) endef @@ -349,7 +349,7 @@ $(eval $(call KernelPackage,video-gspca-sn9c20x)) define KernelPackage/video-gspca-sonixb TITLE:=sonixb webcam support KCONFIG:=CONFIG_USB_GSPCA_SONIXB - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixb.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixb.ko AUTOLOAD:=$(call AutoLoad,75,gspca_sonixb) $(call AddDepends/video-gspca) endef @@ -364,7 +364,7 @@ $(eval $(call KernelPackage,video-gspca-sonixb)) define KernelPackage/video-gspca-sonixj TITLE:=sonixj webcam support KCONFIG:=CONFIG_USB_GSPCA_SONIXJ - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixj.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixj.ko AUTOLOAD:=$(call AutoLoad,75,gspca_sonixj) $(call AddDepends/video-gspca) endef @@ -379,7 +379,7 @@ $(eval $(call KernelPackage,video-gspca-sonixj)) define KernelPackage/video-gspca-spca500 TITLE:=spca500 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA500 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca500.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca500.ko AUTOLOAD:=$(call AutoLoad,75,gspca_spca500) $(call AddDepends/video-gspca) endef @@ -394,7 +394,7 @@ $(eval $(call KernelPackage,video-gspca-spca500)) define KernelPackage/video-gspca-spca501 TITLE:=spca501 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA501 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca501.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca501.ko AUTOLOAD:=$(call AutoLoad,75,gspca_spca501) $(call AddDepends/video-gspca) endef @@ -409,7 +409,7 @@ $(eval $(call KernelPackage,video-gspca-spca501)) define KernelPackage/video-gspca-spca505 TITLE:=spca505 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA505 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca505.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca505.ko AUTOLOAD:=$(call AutoLoad,75,gspca_spca505) $(call AddDepends/video-gspca) endef @@ -424,7 +424,7 @@ $(eval $(call KernelPackage,video-gspca-spca505)) define KernelPackage/video-gspca-spca506 TITLE:=spca506 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA506 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca506.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca506.ko AUTOLOAD:=$(call AutoLoad,75,gspca_spca506) $(call AddDepends/video-gspca) endef @@ -439,7 +439,7 @@ $(eval $(call KernelPackage,video-gspca-spca506)) define KernelPackage/video-gspca-spca508 TITLE:=spca508 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA508 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca508.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca508.ko AUTOLOAD:=$(call AutoLoad,75,gspca_spca508) $(call AddDepends/video-gspca) endef @@ -454,7 +454,7 @@ $(eval $(call KernelPackage,video-gspca-spca508)) define KernelPackage/video-gspca-spca561 TITLE:=spca561 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA561 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca561.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca561.ko AUTOLOAD:=$(call AutoLoad,75,gspca_spca561) $(call AddDepends/video-gspca) endef @@ -469,7 +469,7 @@ $(eval $(call KernelPackage,video-gspca-spca561)) define KernelPackage/video-gspca-sq905 TITLE:=sq905 webcam support KCONFIG:=CONFIG_USB_GSPCA_SQ905 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.ko AUTOLOAD:=$(call AutoLoad,75,gspca_sq905) $(call AddDepends/video-gspca) endef @@ -484,7 +484,7 @@ $(eval $(call KernelPackage,video-gspca-sq905)) define KernelPackage/video-gspca-sq905c TITLE:=sq905c webcam support KCONFIG:=CONFIG_USB_GSPCA_SQ905C - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.ko AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c) $(call AddDepends/video-gspca) endef @@ -499,7 +499,7 @@ $(eval $(call KernelPackage,video-gspca-sq905c)) define KernelPackage/video-gspca-stk014 TITLE:=stk014 webcam support KCONFIG:=CONFIG_USB_GSPCA_STK014 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_stk014.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_stk014.ko AUTOLOAD:=$(call AutoLoad,75,gspca_stk014) $(call AddDepends/video-gspca) endef @@ -514,7 +514,7 @@ $(eval $(call KernelPackage,video-gspca-stk014)) define KernelPackage/video-gspca-sunplus TITLE:=sunplus webcam support KCONFIG:=CONFIG_USB_GSPCA_SUNPLUS - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sunplus.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sunplus.ko AUTOLOAD:=$(call AutoLoad,75,gspca_sunplus) $(call AddDepends/video-gspca) endef @@ -529,7 +529,7 @@ $(eval $(call KernelPackage,video-gspca-sunplus)) define KernelPackage/video-gspca-t613 TITLE:=t613 webcam support KCONFIG:=CONFIG_USB_GSPCA_T613 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_t613.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_t613.ko AUTOLOAD:=$(call AutoLoad,75,gspca_t613) $(call AddDepends/video-gspca) endef @@ -544,7 +544,7 @@ $(eval $(call KernelPackage,video-gspca-t613)) define KernelPackage/video-gspca-tv8532 TITLE:=tv8532 webcam support KCONFIG:=CONFIG_USB_GSPCA_TV8532 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_tv8532.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_tv8532.ko AUTOLOAD:=$(call AutoLoad,75,gspca_tv8532) $(call AddDepends/video-gspca) endef @@ -559,7 +559,7 @@ $(eval $(call KernelPackage,video-gspca-tv8532)) define KernelPackage/video-gspca-vc032x TITLE:=vc032x webcam support KCONFIG:=CONFIG_USB_GSPCA_VC032X - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_vc032x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_vc032x.ko AUTOLOAD:=$(call AutoLoad,75,gspca_vc032x) $(call AddDepends/video-gspca) endef @@ -574,7 +574,7 @@ $(eval $(call KernelPackage,video-gspca-vc032x)) define KernelPackage/video-gspca-zc3xx TITLE:=zc3xx webcam support KCONFIG:=CONFIG_USB_GSPCA_ZC3XX - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_zc3xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_zc3xx.ko AUTOLOAD:=$(call AutoLoad,75,gspca_zc3xx) $(call AddDepends/video-gspca) endef @@ -589,7 +589,7 @@ $(eval $(call KernelPackage,video-gspca-zc3xx)) define KernelPackage/video-gspca-m5602 TITLE:=m5602 webcam support KCONFIG:=CONFIG_USB_M5602 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/m5602/gspca_m5602.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/m5602/gspca_m5602.ko AUTOLOAD:=$(call AutoLoad,75,gspca_m5602) $(call AddDepends/video-gspca) endef @@ -604,7 +604,7 @@ $(eval $(call KernelPackage,video-gspca-m5602)) define KernelPackage/video-gspca-stv06xx TITLE:=stv06xx webcam support KCONFIG:=CONFIG_USB_STV06XX - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.ko AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx) $(call AddDepends/video-gspca) endef @@ -620,7 +620,7 @@ define KernelPackage/video-gspca-gl860 TITLE:=gl860 webcam support DEPENDS:=@LINUX_2_6_32 KCONFIG:=CONFIG_USB_GL860 - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gl860/gspca_gl860.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gl860/gspca_gl860.ko AUTOLOAD:=$(call AutoLoad,75,gspca_gl860) $(call AddDepends/video-gspca) endef @@ -636,7 +636,7 @@ define KernelPackage/video-gspca-jeilinj TITLE:=jeilinj webcam support DEPENDS:=@LINUX_2_6_32 KCONFIG:=CONFIG_USB_GSPCA_JEILINJ - FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_jeilinj.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_jeilinj.ko AUTOLOAD:=$(call AutoLoad,75,gspca_jeilinj) $(call AddDepends/video-gspca) endef diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index 578abd1176..47d8f3682e 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -13,7 +13,7 @@ define KernelPackage/w1 SUBMENU:=$(W1_MENU) TITLE:=Dallas's 1-wire support KCONFIG:=CONFIG_W1 - FILES:=$(LINUX_DIR)/drivers/w1/wire.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/w1/wire.ko AUTOLOAD:=$(call AutoLoad,50,wire) endef @@ -37,7 +37,7 @@ define KernelPackage/w1-master-gpio TITLE:=GPIO 1-wire bus master driver DEPENDS:=@GPIO_SUPPORT KCONFIG:=CONFIG_W1_MASTER_GPIO - FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(W1_MASTERS_DIR)/w1-gpio.ko AUTOLOAD:=$(call AutoLoad,60,w1-gpio) $(call AddDepends/w1) endef @@ -55,7 +55,7 @@ $(eval $(call KernelPackage,w1-master-gpio)) define KernelPackage/w1-slave-therm TITLE:=Thermal family implementation KCONFIG:=CONFIG_W1_SLAVE_THERM - FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX) + FILES:=$(W1_SLAVES_DIR)/w1_therm.ko AUTOLOAD:=$(call AutoLoad,70,w1_therm) $(call AddDepends/w1) endef @@ -70,7 +70,7 @@ $(eval $(call KernelPackage,w1-slave-therm)) define KernelPackage/w1-slave-smem TITLE:=Simple 64bit memory family implementation KCONFIG:=CONFIG_W1_SLAVE_SMEM - FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX) + FILES:=$(W1_SLAVES_DIR)/w1_smem.ko AUTOLOAD:=$(call AutoLoad,70,w1_smem) $(call AddDepends/w1) endef @@ -87,7 +87,7 @@ define KernelPackage/w1-slave-ds2433 KCONFIG:= \ CONFIG_W1_SLAVE_DS2433 \ CONFIG_W1_SLAVE_DS2433_CRC=n - FILES:=$(W1_SLAVES_DIR)/w1_ds2433.$(LINUX_KMOD_SUFFIX) + FILES:=$(W1_SLAVES_DIR)/w1_ds2433.ko AUTOLOAD:=$(call AutoLoad,70,w1_ds2433) $(call AddDepends/w1) endef @@ -104,7 +104,7 @@ define KernelPackage/w1-slave-ds2760 KCONFIG:= \ CONFIG_W1_SLAVE_DS2760 \ CONFIG_W1_SLAVE_DS2433_CRC=n - FILES:=$(W1_SLAVES_DIR)/w1_ds2760.$(LINUX_KMOD_SUFFIX) + FILES:=$(W1_SLAVES_DIR)/w1_ds2760.ko AUTOLOAD:=$(call AutoLoad,70,w1_ds2760) $(call AddDepends/w1) endef diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index d7afa48e2e..f0dd3b8e36 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -16,10 +16,10 @@ define KernelPackage/lib80211 CONFIG_LIB80211_CRYPT_TKIP \ CONFIG_LIB80211_CRYPT_CCMP FILES:= \ - $(LINUX_DIR)/net/wireless/lib80211.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/wireless/lib80211.ko \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.ko \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.ko \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.ko AUTOLOAD:=$(call AutoLoad,10, \ lib80211 \ lib80211_crypt_wep \ @@ -44,7 +44,7 @@ define KernelPackage/net-airo TITLE:=Cisco Aironet driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_AIRO - FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko AUTOLOAD:=$(call AutoLoad,50,airo) endef @@ -62,7 +62,7 @@ define KernelPackage/net-hermes KCONFIG:=CONFIG_HERMES \ CONFIG_HERMES_CACHE_FW_ON_INIT=n FILES:= \ - $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.ko AUTOLOAD:=$(call AutoLoad,50,orinoco) endef @@ -78,7 +78,7 @@ define KernelPackage/net-hermes-pci TITLE:=Intersil Prism 2.5 PCI support DEPENDS:=@PCI_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PCI_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) endef @@ -94,7 +94,7 @@ define KernelPackage/net-hermes-plx TITLE:=PLX9052 based PCI adaptor DEPENDS:=@PCI_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PLX_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) endef @@ -110,7 +110,7 @@ define KernelPackage/net-hermes-pcmcia TITLE:=Hermes based PCMCIA adaptors DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PCMCIA_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko AUTOLOAD:=$(call AutoLoad,55,orinoco_cs) endef @@ -126,7 +126,7 @@ define KernelPackage/net-prism54 TITLE:=Intersil Prism54 support DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_PRISM54 - FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko AUTOLOAD:=$(call AutoLoad,60,prism54) endef diff --git a/package/kernel/modules/xen.mk b/package/kernel/modules/xen.mk index 2252af469e..b0ce29761d 100644 --- a/package/kernel/modules/xen.mk +++ b/package/kernel/modules/xen.mk @@ -14,7 +14,7 @@ define KernelPackage/xen-fs KCONFIG:= \ CONFIG_XENFS \ CONFIG_XEN_COMPAT_XENFS=y - FILES:=$(LINUX_DIR)/drivers/xen/xenfs/xenfs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/xen/xenfs/xenfs.ko AUTOLOAD:=$(call AutoLoad,05,xenfs) endef @@ -30,7 +30,7 @@ define KernelPackage/xen-evtchn TITLE:=Xen event channels DEPENDS:=@TARGET_x86_xen_domu KCONFIG:=CONFIG_XEN_DEV_EVTCHN - FILES:=$(LINUX_DIR)/drivers/xen/evtchn.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/xen/evtchn.ko AUTOLOAD:=$(call AutoLoad,06,evtchn) endef @@ -55,12 +55,12 @@ define KernelPackage/xen-fbdev CONFIG_FB_SYS_IMAGEBLIT \ CONFIG_FIRMWARE_EDID=n FILES:= \ - $(LINUX_DIR)/drivers/video/xen-fbfront.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/video/fb.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/video/syscopyarea.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/video/sysfillrect.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/video/fb_sys_fops.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/video/sysimgblt.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/video/xen-fbfront.ko \ + $(LINUX_DIR)/drivers/video/fb.ko \ + $(LINUX_DIR)/drivers/video/syscopyarea.ko \ + $(LINUX_DIR)/drivers/video/sysfillrect.ko \ + $(LINUX_DIR)/drivers/video/fb_sys_fops.ko \ + $(LINUX_DIR)/drivers/video/sysimgblt.ko AUTOLOAD:=$(call AutoLoad,07, \ fb \ syscopyarea \ @@ -83,7 +83,7 @@ define KernelPackage/xen-kbddev TITLE:=Xen virtual keyboard and mouse DEPENDS:=@TARGET_x86_xen_domu KCONFIG:=CONFIG_XEN_KBDDEV_FRONTEND - FILES:=$(LINUX_DIR)/drivers/input/xen-kbdfront.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/xen-kbdfront.ko AUTOLOAD:=$(call AutoLoad,08,xen-kbdfront) endef @@ -99,7 +99,7 @@ define KernelPackage/xen-netdev TITLE:=Xen network device frontend DEPENDS:=@TARGET_x86_xen_domu KCONFIG:=CONFIG_XEN_NETDEV_FRONTEND - FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.ko AUTOLOAD:=$(call AutoLoad,09,xen-netfront) endef diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 71ce17addc..51ac7696e2 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -44,14 +44,14 @@ define KernelPackage/cfg80211 DEPENDS+= +wireless-tools +iw @!LINUX_2_6_25 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) FILES:= \ - $(PKG_BUILD_DIR)/compat/compat.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/compat/compat.ko \ + $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko AUTOLOAD:=$(call AutoLoad,20,compat cfg80211) else FILES:= \ - $(PKG_BUILD_DIR)/compat/compat.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/compat/compat_firmware_class.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/compat/compat.ko \ + $(PKG_BUILD_DIR)/compat/compat_firmware_class.ko \ + $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko AUTOLOAD:=$(call AutoLoad,20,compat compat_firmware_class cfg80211) endif endef @@ -64,7 +64,7 @@ define KernelPackage/mac80211 $(call KernelPackage/mac80211/Default) TITLE:=Linux 802.11 Wireless Networking Stack DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 - FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) + FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko AUTOLOAD:=$(call AutoLoad,21,mac80211) MENU:=1 endef @@ -120,7 +120,7 @@ define KernelPackage/p54-common $(call KernelPackage/p54/Default) DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT +kmod-mac80211 TITLE+= (COMMON) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.ko AUTOLOAD:=$(call AutoLoad,30,p54common) endef @@ -128,7 +128,7 @@ define KernelPackage/p54-pci $(call KernelPackage/p54/Default) TITLE+= (PCI) DEPENDS+= @PCI_SUPPORT +kmod-p54-common - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54pci.ko AUTOLOAD:=$(call AutoLoad,31,p54pci) endef @@ -136,7 +136,7 @@ define KernelPackage/p54-usb $(call KernelPackage/p54/Default) TITLE+= (USB) DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54usb.ko AUTOLOAD:=$(call AutoLoad,31,p54usb) endef @@ -197,7 +197,7 @@ define KernelPackage/rt2x00-lib $(call KernelPackage/rt2x00/Default) DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-crc-itu-t TITLE+= (LIB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.ko AUTOLOAD:=$(call AutoLoad,25,rt2x00lib) MENU:=1 endef @@ -226,7 +226,7 @@ define KernelPackage/rt2x00-pci $(call KernelPackage/rt2x00/Default) DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-eeprom-93cx6 TITLE+= (PCI) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00pci.ko AUTOLOAD:=$(call AutoLoad,26,rt2x00pci) endef @@ -234,7 +234,7 @@ define KernelPackage/rt2x00-usb $(call KernelPackage/rt2x00/Default) DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib +kmod-usb-core TITLE+= (USB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00usb.ko AUTOLOAD:=$(call AutoLoad,26,rt2x00usb) endef @@ -242,7 +242,7 @@ define KernelPackage/rt2x00-soc $(call KernelPackage/rt2x00/Default) DEPENDS+= @TARGET_ramips +kmod-rt2x00-lib TITLE+= (SoC) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko AUTOLOAD:=$(call AutoLoad,26,rt2x00soc) endef @@ -250,7 +250,7 @@ define KernelPackage/rt2800-lib $(call KernelPackage/rt2x00/Default) DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +USB_SUPPORT:kmod-rt2x00-usb +TARGET_ramips:kmod-rt2x00-soc TITLE+= (rt2800 LIB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.ko AUTOLOAD:=$(call AutoLoad,27,rt2800lib) endef @@ -258,7 +258,7 @@ define KernelPackage/rt2400-pci $(call KernelPackage/rt2x00/Default) DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci TITLE+= (RT2400 PCI) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2400pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2400pci.ko AUTOLOAD:=$(call AutoLoad,27,rt2400pci) endef @@ -266,7 +266,7 @@ define KernelPackage/rt2500-pci $(call KernelPackage/rt2x00/Default) DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci TITLE+= (RT2500 PCI) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500pci.ko AUTOLOAD:=$(call AutoLoad,27,rt2500pci) endef @@ -274,7 +274,7 @@ define KernelPackage/rt2500-usb $(call KernelPackage/rt2x00/Default) DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb TITLE+= (RT2500 USB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500usb.ko AUTOLOAD:=$(call AutoLoad,27,rt2500usb) endef @@ -282,7 +282,7 @@ define KernelPackage/rt61-pci $(call KernelPackage/rt2x00/Default) DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci TITLE+= (RT2x61 PCI) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt61pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt61pci.ko AUTOLOAD:=$(call AutoLoad,27,rt61pci) endef @@ -290,7 +290,7 @@ define KernelPackage/rt73-usb $(call KernelPackage/rt2x00/Default) DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb TITLE+= (RT73 USB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt73usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt73usb.ko AUTOLOAD:=$(call AutoLoad,27,rt73usb) endef @@ -298,7 +298,7 @@ define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) DEPENDS+= +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc TITLE+= (RT2860 PCI) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko AUTOLOAD:=$(call AutoLoad,28,rt2800pci) endef @@ -306,7 +306,7 @@ define KernelPackage/rt2800-usb $(call KernelPackage/rt2x00/Default) DEPENDS+= +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-crc-ccitt TITLE+= (RT2870 USB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.ko AUTOLOAD:=$(call AutoLoad,28,rt2800usb) endef @@ -321,7 +321,7 @@ define KernelPackage/rtl8180 $(call KernelPackage/rtl818x/Default) DEPENDS+= @PCI_SUPPORT TITLE+= (RTL8180 PCI) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8180.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8180.ko AUTOLOAD:=$(call AutoLoad,27,rtl8180) endef @@ -329,7 +329,7 @@ define KernelPackage/rtl8187 $(call KernelPackage/rtl818x/Default) DEPENDS+= @USB_SUPPORT TITLE+= (RTL8187 USB) - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8187.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8187.ko AUTOLOAD:=$(call AutoLoad,27,rtl8187) endef @@ -346,7 +346,7 @@ define KernelPackage/zd1211rw $(call KernelPackage/mac80211/Default) TITLE:=Zydas ZD1211 support DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-mac80211 - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.ko AUTOLOAD:=$(call AutoLoad,60,zd1211rw) endef @@ -378,7 +378,7 @@ define KernelPackage/ath $(call KernelPackage/mac80211/Default) TITLE:=Atheros common driver part DEPENDS+= @PCI_SUPPORT +kmod-mac80211 - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko AUTOLOAD:=$(call AutoLoad,26,ath) MENU:=1 endef @@ -392,7 +392,7 @@ define KernelPackage/ath5k TITLE:=Atheros 5xxx wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath5k DEPENDS+= +kmod-ath - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko AUTOLOAD:=$(call AutoLoad,27,ath5k) endef @@ -407,9 +407,9 @@ define KernelPackage/ath9k URL:=http://linuxwireless.org/en/users/Drivers/ath9k DEPENDS+= +kmod-ath FILES:= \ - $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ + $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko \ + $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common ath9k) MENU:=1 endef @@ -464,8 +464,8 @@ define KernelPackage/libertas-usb DEPENDS+= @USB_SUPPORT +kmod-mac80211 +kmod-usb-core +kmod-lib80211 TITLE:=Marvell 88W8015 Wireless Driver FILES:= \ - $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/usb8xxx.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \ + $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/usb8xxx.ko AUTOLOAD:=$(call AutoLoad,27,libertas usb8xxx) endef @@ -474,8 +474,8 @@ define KernelPackage/libertas-sd DEPENDS+= +kmod-mac80211 +kmod-lib80211 TITLE:=Marvell 88W8686 Wireless Driver FILES:= \ - $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \ + $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.ko AUTOLOAD:=$(call AutoLoad,27,libertas libertas_sdio) endef @@ -484,7 +484,7 @@ define KernelPackage/ar9170 TITLE:=Atheros AR9170 802.11n USB support URL:=http://wireless.kernel.org/en/users/Drivers/ar9170 DEPENDS+= @USB_SUPPORT @!LINUX_2_6_25 +kmod-ath +kmod-usb-core - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ar9170/ar9170usb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ar9170/ar9170usb.ko AUTOLOAD:=$(call AutoLoad,27,ar9170usb) endef @@ -496,7 +496,7 @@ define KernelPackage/mac80211-hwsim $(call KernelPackage/mac80211/Default) TITLE:=mac80211 HW simulation device DEPENDS+= +kmod-mac80211 - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.ko AUTOLOAD:=$(call AutoLoad,60,mac80211_hwsim) endef @@ -504,7 +504,7 @@ define KernelPackage/net-libipw $(call KernelPackage/mac80211/Default) TITLE:=libipw for ipw2100 and ipw2200 DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko AUTOLOAD:=$(call AutoLoad,49,libipw) endef @@ -526,7 +526,7 @@ define KernelPackage/net-ipw2100 $(call KernelPackage/mac80211/Default) TITLE:=Intel IPW2100 driver DEPENDS:=@PCI_SUPPORT +kmod-net-libipw - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2100.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2100.ko AUTOLOAD:=$(call AutoLoad,50,ipw2100) endef @@ -550,7 +550,7 @@ define KernelPackage/net-ipw2200 $(call KernelPackage/mac80211/Default) TITLE:=Intel IPW2200 driver DEPENDS:=@PCI_SUPPORT +kmod-net-libipw - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2200.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2200.ko AUTOLOAD:=$(call AutoLoad,50,ipw2200) endef @@ -566,7 +566,7 @@ define KernelPackage/mwl8k TITLE:=Driver for Marvell TOPDOG 802.11 Wireless cards URL:=http://wireless.kernel.org/en/users/Drivers/mwl8k DEPENDS+= @PCI_SUPPORT +kmod-mac80211 - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mwl8k.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mwl8k.ko AUTOLOAD:=$(call AutoLoad,27,mwl8k) endef @@ -661,7 +661,7 @@ endef define KernelPackage/b43 $(call KernelPackage/b43-common) TITLE:=Broadcom 43xx wireless support - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko AUTOLOAD:=$(call AutoLoad,30,b43) MENU:=1 endef @@ -759,7 +759,7 @@ endef define KernelPackage/b43legacy $(call KernelPackage/b43-common) TITLE:=Broadcom 43xx-legacy wireless support - FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43legacy/b43legacy.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43legacy/b43legacy.ko AUTOLOAD:=$(call AutoLoad,30,b43legacy) MENU:=1 endef diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 9a2d23faad..2fe2f9176e 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -112,19 +112,19 @@ ifdef CONFIG_MADWIFI_RCA_SAMPLERATE endif ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) -MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) +MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko else MADWIFI_FILES:= \ - $(PKG_BUILD_DIR)/net80211/wlan.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_acl.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_ccmp.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_tkip.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_wep.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan_xauth.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/net80211/wlan.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.ko \ + $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko \ + $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).ko \ + $(PKG_BUILD_DIR)/net80211/wlan_acl.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_ccmp.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_tkip.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_wep.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_xauth.ko endif ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) @@ -144,11 +144,11 @@ else endif ifeq ($(findstring AHB,$(BUS)),AHB) - MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX) + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.ko MADWIFI_AUTOLOAD+= ath_ahb endif ifeq ($(findstring PCI,$(BUS)),PCI) - MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.ko MADWIFI_AUTOLOAD+= ath_pci endif diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile index 5a3ab1d601..025e704eb6 100644 --- a/package/mmc_over_gpio/Makefile +++ b/package/mmc_over_gpio/Makefile @@ -19,7 +19,7 @@ define KernelPackage/mmc-over-gpio KCONFIG:=CONFIG_GPIOMMC \ CONFIG_CONFIGFS_FS=y TITLE:=MMC/SD card over GPIO support - FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.ko AUTOLOAD:=$(call AutoLoad,93,gpiommc) MENU:=1 endef diff --git a/package/r8101/Makefile b/package/r8101/Makefile index 0e6f08d425..0974357e3d 100644 --- a/package/r8101/Makefile +++ b/package/r8101/Makefile @@ -26,7 +26,7 @@ define KernelPackage/r8101 TITLE:=RealTek RTL-8101E PCIe Fast Ethernet Adapter kernel support DEPENDS:=@TARGET_x86 URL:=http://www.realtek.com.tw/ - FILES:= $(PKG_BUILD_DIR)/src/r8101.$(LINUX_KMOD_SUFFIX) + FILES:= $(PKG_BUILD_DIR)/src/r8101.ko AUTOLOAD:=$(call AutoLoad,50,r8101) endef diff --git a/package/rtc-rv5c386a/Makefile b/package/rtc-rv5c386a/Makefile index 9f53b76675..e13ead528a 100644 --- a/package/rtc-rv5c386a/Makefile +++ b/package/rtc-rv5c386a/Makefile @@ -18,7 +18,7 @@ define KernelPackage/rtc-rv5c386a DEPENDS:=@TARGET_brcm47xx TITLE:=Driver for RTC RV5C386A (used in WL-700gE and WL-HDD) AUTOLOAD:=$(call AutoLoad,70,rtc) - FILES:=$(PKG_BUILD_DIR)/rtc.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/rtc.ko endef define Build/Prepare diff --git a/package/siit/Makefile b/package/siit/Makefile index 1d014a7500..4cd147f77b 100644 --- a/package/siit/Makefile +++ b/package/siit/Makefile @@ -18,7 +18,7 @@ define KernelPackage/siit SUBMENU:=Network Devices TITLE:=Stateless IP ICMP Translation Algorithm DEPENDS:= @(!(TARGET_ps3||TARGET_pxcab)||BROKEN) - FILES:=$(PKG_BUILD_DIR)/siit.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/siit.ko AUTOLOAD:=$(call AutoLoad,50,siit) endef diff --git a/package/spi-ks8995/Makefile b/package/spi-ks8995/Makefile index 7075faa9b8..0be9fe3dc6 100644 --- a/package/spi-ks8995/Makefile +++ b/package/spi-ks8995/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/spi-ks8995 SUBMENU:=SPI Support TITLE:=Micrel/Kendin KS8995 Ethernet switch control - FILES:=$(PKG_BUILD_DIR)/spi_ks8995.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/spi_ks8995.ko KCONFIG:=CONFIG_SPI=y \ CONFIG_SPI_MASTER=y AUTOLOAD:=$(call AutoLoad,50,spi_ks8995) diff --git a/package/switch/Makefile b/package/switch/Makefile index 7570f56d3d..a2baf99d1b 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -18,9 +18,9 @@ define KernelPackage/switch DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx TITLE:=Switch drivers FILES:= \ - $(PKG_BUILD_DIR)/switch-core.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/switch-adm.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/switch-robo.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/switch-core.ko \ + $(PKG_BUILD_DIR)/switch-adm.ko \ + $(PKG_BUILD_DIR)/switch-robo.ko AUTOLOAD:=$(call AutoLoad,20,switch-core switch-robo switch-adm) endef diff --git a/package/ubsec_ssb/Makefile b/package/ubsec_ssb/Makefile index 6c05e517af..bac2aabcbb 100644 --- a/package/ubsec_ssb/Makefile +++ b/package/ubsec_ssb/Makefile @@ -20,7 +20,7 @@ define KernelPackage/ocf-ubsec-ssb SUBMENU:=$(CRYPTO_MENU) DEPENDS:=@TARGET_brcm47xx +kmod-crypto-core +kmod-crypto-ocf TITLE:=BCM5365P IPSec Core driver - FILES:=$(PKG_BUILD_DIR)/src/ubsec_ssb.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/src/ubsec_ssb.ko AUTOLOAD:=$(call AutoLoad,09,ubsec_ssb) endef diff --git a/package/w1-gpio-custom/Makefile b/package/w1-gpio-custom/Makefile index bbd9600209..c1441e9caa 100644 --- a/package/w1-gpio-custom/Makefile +++ b/package/w1-gpio-custom/Makefile @@ -17,7 +17,7 @@ define KernelPackage/w1-gpio-custom SUBMENU:=W1 support TITLE:=Custom GPIO-based 1-wire device DEPENDS:=kmod-w1 +kmod-w1-master-gpio - FILES:=$(PKG_BUILD_DIR)/w1-gpio-custom.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/w1-gpio-custom.ko KCONFIG:= endef diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile index d8e5a3b064..65b85c235f 100644 --- a/package/wprobe/Makefile +++ b/package/wprobe/Makefile @@ -33,7 +33,7 @@ $(call Package/wprobe/Default) TITLE:=Wireless driver probe infrastructure MAINTAINER:=Felix Fietkau FILES:= \ - $(PKG_BUILD_DIR)/kernel/wprobe.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/kernel/wprobe.ko AUTOLOAD:=$(call AutoLoad,01,wprobe) endef diff --git a/package/wrt55agv2-spidevs/Makefile b/package/wrt55agv2-spidevs/Makefile index ab5c451347..a149303888 100644 --- a/package/wrt55agv2-spidevs/Makefile +++ b/package/wrt55agv2-spidevs/Makefile @@ -17,7 +17,7 @@ define KernelPackage/wrt55agv2-spidevs SUBMENU:=Other modules TITLE:=WRT55AG v2 SPI devices support DEPENDS:=@TARGET_atheros +kmod-spi-gpio-old +kmod-spi-ks8995 - FILES:=$(PKG_BUILD_DIR)/wrt55agv2_spidevs.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/wrt55agv2_spidevs.ko endef define KernelPackage/wrt55agv2-spidevs/description diff --git a/target/linux/adm5120/modules.mk b/target/linux/adm5120/modules.mk index 69b8d2ee3b..0d0ccc69c0 100644 --- a/target/linux/adm5120/modules.mk +++ b/target/linux/adm5120/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/ledtrig-adm5120-switch TITLE:=LED ADM5120 Switch Port Status Trigger DEPENDS:=@TARGET_adm5120 KCONFIG:=CONFIG_LEDS_TRIGGER_ADM5120_SWITCH - FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-adm5120-switch.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-adm5120-switch.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-adm5120-switch) endef @@ -27,7 +27,7 @@ define KernelPackage/pata-rb153-cf TITLE:=RouterBOARD 153 CF Slot support DEPENDS:=@TARGET_adm5120_router_le KCONFIG:=CONFIG_PATA_RB153_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_rb153_cf.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_rb153_cf.ko AUTOLOAD:=$(call AutoLoad,30,pata_rb153_cf,1) $(call AddDepends/ata) endef @@ -44,7 +44,7 @@ define KernelPackage/usb-adm5120 TITLE:=Support for the ADM5120 HCD controller DEPENDS:=@TARGET_adm5120 KCONFIG:=CONFIG_USB_ADM5120_HCD - FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.ko AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd,1) $(call AddDepends/usb) endef diff --git a/target/linux/at91/modules.mk b/target/linux/at91/modules.mk index 36c7b96560..438b663a16 100644 --- a/target/linux/at91/modules.mk +++ b/target/linux/at91/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/mmc-at91 TITLE:=MMC/SD Card Support on AT91 DEPENDS:=@TARGET_at91 +kmod-mmc KCONFIG:=CONFIG_MMC_AT91 - FILES:=$(LINUX_DIR)/drivers/mmc/host/at91_mci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/mmc/host/at91_mci.ko AUTOLOAD:=$(call AutoLoad,90,at91_mci,1) endef @@ -26,7 +26,7 @@ define KernelPackage/pwm-atmel DEPENDS:=@TARGET_at91 KCONFIG:=CONFIG_GENERIC_PWM \ CONFIG_ATMEL_PWM - FILES:=$(LINUX_DIR)/drivers/pwm/atmel-pwm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/pwm/atmel-pwm.ko AUTOLOAD:=$(call AutoLoad,51,atmel-pwm) endef diff --git a/target/linux/au1000/modules.mk b/target/linux/au1000/modules.mk index 4c403f062a..e001db4280 100644 --- a/target/linux/au1000/modules.mk +++ b/target/linux/au1000/modules.mk @@ -9,7 +9,7 @@ define KernelPackage/pcmcia-au1000 SUBMENU:=$(PCMCIA_MENU) TITLE:=RMI/AMD Au1000 PCMCIA support DEPENDS:=@TARGET_au1000 kmod-pcmcia-core - FILES:=$(LINUX_DIR)/drivers/pcmcia/au1x00_ss.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/pcmcia/au1x00_ss.ko AUTOLOAD:=$(call AutoLoad,41,au1x00_ss) endef diff --git a/target/linux/avr32/modules.mk b/target/linux/avr32/modules.mk index 7f1f0a2110..415f64be12 100644 --- a/target/linux/avr32/modules.mk +++ b/target/linux/avr32/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/atmel-wdt TITLE:=AT32AP700x watchdog DEPENDS:=@TARGET_avr32 KCONFIG:=CONFIG_AT32AP700X_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.ko AUTOLOAD:=$(call AutoLoad,50,at32ap700x_wdt) endef diff --git a/target/linux/brcm63xx/modules.mk b/target/linux/brcm63xx/modules.mk index bfef919b17..845fb644a7 100644 --- a/target/linux/brcm63xx/modules.mk +++ b/target/linux/brcm63xx/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/bcm63xx-spi TITLE:=Broadcom BCM63xx SPI driver DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang KCONFIG:=CONFIG_SPI_BCM63XX - FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.ko AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi) endef @@ -26,7 +26,7 @@ define KernelPackage/pcmcia-bcm63xx TITLE:=Broadcom BCM63xx PCMCIA support DEPENDS:=@TARGET_brcm63xx kmod-pcmcia-core KCONFIG:=CONFIG_PCMCIA_BCM63XX - FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.ko AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia) endef diff --git a/target/linux/ixp4xx/modules.mk b/target/linux/ixp4xx/modules.mk index c58881b072..e088497793 100644 --- a/target/linux/ixp4xx/modules.mk +++ b/target/linux/ixp4xx/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/ata-ixp4xx-cf TITLE:=IXP4XX Compact Flash support DEPENDS:=@TARGET_ixp4xx KCONFIG:=CONFIG_PATA_IXP4XX_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.ko AUTOLOAD:=$(call AutoLoad,41,pata_ixp4xx_cf,1) $(call AddDepends/ata) endef @@ -29,7 +29,7 @@ define KernelPackage/ixp4xx-beeper KCONFIG:= \ CONFIG_INPUT_MISC=y \ CONFIG_INPUT_IXP4XX_BEEPER - FILES:=$(LINUX_DIR)/drivers/input/misc/ixp4xx-beeper.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/misc/ixp4xx-beeper.ko AUTOLOAD:=$(call AutoLoad,50,ixp4xx-beeper) $(call AddDepends/input) endef diff --git a/target/linux/octeon/modules.mk b/target/linux/octeon/modules.mk index a161d68493..a4552580b4 100644 --- a/target/linux/octeon/modules.mk +++ b/target/linux/octeon/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/ata-octeon-cf TITLE:=Octeon Compact Flash support DEPENDS:=@TARGET_octeon KCONFIG:=CONFIG_PATA_OCTEON_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_octeon_cf.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_octeon_cf.ko AUTOLOAD:=$(call AutoLoad,41,pata_octeon_cf,1) $(call AddDepends/ata) endef @@ -27,7 +27,7 @@ define KernelPackage/usb-octeon TITLE:=Support for the Octeon USB OTG controller DEPENDS:=@TARGET_octeon KCONFIG:=CONFIG_USB_DWC_OTG - FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.ko AUTOLOAD:=$(call AutoLoad,50,dwc_otg) $(call AddDepends/usb) endef diff --git a/target/linux/ppc40x/modules.mk b/target/linux/ppc40x/modules.mk index 7a1247672c..8859a27578 100644 --- a/target/linux/ppc40x/modules.mk +++ b/target/linux/ppc40x/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/ata-magicbox-cf TITLE:=Magicbox v2/OpenRB Compact flash support DEPENDS:=@TARGET_ppc40x KCONFIG:=CONFIG_PATA_MAGICBOX_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.ko AUTOLOAD:=$(call AutoLoad,41,pata_magicbox_cf,1) $(call AddDepends/ata) endef diff --git a/target/linux/ps3/modules.mk b/target/linux/ps3/modules.mk index 258652459f..51638181a6 100644 --- a/target/linux/ps3/modules.mk +++ b/target/linux/ps3/modules.mk @@ -12,7 +12,7 @@ define KernelPackage/ps3lan KCONFIG:= \ CONFIG_GELIC_NET \ CONFIG_GELIC_WIRELESS=y - FILES:=$(LINUX_DIR)/drivers/net/ps3_gelic.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ps3_gelic.ko AUTOLOAD:=$(call AutoLoad,50,ps3_gelic) endef @@ -28,7 +28,7 @@ define KernelPackage/ps3vram TITLE:=PS3 Video RAM Storage Driver DEPENDS:=@TARGET_ps3 KCONFIG:=CONFIG_PS3_VRAM - FILES:=$(LINUX_DIR)/drivers/block/ps3vram.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/ps3vram.ko AUTOLOAD:=$(call AutoLoad,01,ps3vram) endef @@ -46,7 +46,7 @@ define KernelPackage/sound-ps3 KCONFIG:=CONFIG_SND_PS3 \ CONFIG_SND_PPC=y \ CONFIG_SND_PS3_DEFAULT_START_DELAY=2000 - FILES:=$(LINUX_DIR)/sound/ppc/snd_ps3.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/sound/ppc/snd_ps3.ko AUTOLOAD:=$(call AutoLoad,35, snd_ps3) $(call AddDepends/sound) endef diff --git a/target/linux/pxcab/modules.mk b/target/linux/pxcab/modules.mk index 742cbd2011..0c5a254a9a 100644 --- a/target/linux/pxcab/modules.mk +++ b/target/linux/pxcab/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/axonram TITLE:=Axon DDR2 memory device driver DEPENDS:=@TARGET_pxcab KCONFIG:=CONFIG_AXON_RAM - FILES:=$(LINUX_DIR)/arch/powerpc/sysdev/axonram.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/arch/powerpc/sysdev/axonram.ko AUTOLOAD:=$(call AutoLoad,01,axonram) endef diff --git a/target/linux/rb532/modules.mk b/target/linux/rb532/modules.mk index abf9f72a64..0cbbdab3ea 100644 --- a/target/linux/rb532/modules.mk +++ b/target/linux/rb532/modules.mk @@ -13,8 +13,8 @@ define KernelPackage/ata-rb532-cf CONFIG_PATA_PLATFORM \ CONFIG_PATA_RB532 FILES:=\ - $(LINUX_DIR)/drivers/ata/pata_platform.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/ata/pata_rb532_cf.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ata/pata_platform.ko \ + $(LINUX_DIR)/drivers/ata/pata_rb532_cf.ko AUTOLOAD:=$(call AutoLoad,41,pata_platform pata_rb532_cf,1) $(call AddDepends/ata) endef @@ -33,7 +33,7 @@ define KernelPackage/input-rb532 KCONFIG:= \ CONFIG_INPUT_MISC=y \ CONFIG_INPUT_RB532_BUTTON - FILES:=$(LINUX_DIR)/drivers/input/misc/rb532_button.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/input/misc/rb532_button.ko AUTOLOAD:=$(call AutoLoad,62,rb532_button) $(call AddDepends/input) endef diff --git a/target/linux/rdc/modules.mk b/target/linux/rdc/modules.mk index bb4c0cbe4e..ce7cbdf6e3 100644 --- a/target/linux/rdc/modules.mk +++ b/target/linux/rdc/modules.mk @@ -10,7 +10,7 @@ define KernelPackage/rdc321x-wdt TITLE:=RDC321x watchdog DEPENDS:=@TARGET_rdc KCONFIG:=CONFIG_RDC321X_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.ko AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt) endef diff --git a/target/linux/s3c24xx/modules.mk b/target/linux/s3c24xx/modules.mk index 320437e8d0..544aaff6ed 100644 --- a/target/linux/s3c24xx/modules.mk +++ b/target/linux/s3c24xx/modules.mk @@ -1,17 +1,17 @@ ifeq ($(CONFIG_TARGET_s3c24xx),y) SOUNDCORE_FILES = \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/seq/snd-seq-device.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/soc/snd-soc-core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-s3c24xx-i2s.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-s3c24xx.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-neo1973-gta02-wm8753.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8753.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/sound/soundcore.ko \ + $(LINUX_DIR)/sound/core/snd.ko \ + $(LINUX_DIR)/sound/core/snd-page-alloc.ko \ + $(LINUX_DIR)/sound/core/snd-hwdep.ko \ + $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko \ + $(LINUX_DIR)/sound/core/snd-timer.ko \ + $(LINUX_DIR)/sound/core/snd-pcm.ko \ + $(LINUX_DIR)/sound/soc/snd-soc-core.ko \ + $(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-s3c24xx-i2s.ko \ + $(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-s3c24xx.ko \ + $(LINUX_DIR)/sound/soc/s3c24xx/snd-soc-neo1973-gta02-wm8753.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-wm8753.ko SOUNDCORE_LOAD = \ soundcore \ snd \ diff --git a/target/linux/xburst/modules.mk b/target/linux/xburst/modules.mk index fc6d0c0e16..3833acd70e 100644 --- a/target/linux/xburst/modules.mk +++ b/target/linux/xburst/modules.mk @@ -8,8 +8,8 @@ define KernelPackage/sound-soc-jz4740 TITLE:=JZ4740 SoC sound support KCONFIG:=CONFIG_SND_JZ4740_SOC CONFIG_SND_JZ4740_SOC_I2S @TARGET_xburst FILES:= \ - $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740-i2s.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740.ko \ + $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740-i2s.ko AUTOLOAD:=$(call AutoLoad,60,snd-soc-jz4740 snd-soc-jz4740-i2s) endef @@ -18,7 +18,7 @@ define KernelPackage/sound-soc-jzcodec DEPENDS:=kmod-sound-soc-core @TARGET_xburst TITLE:=JZ4740 SoC internal codec support KCONFIG:=CONFIG_SND_SOC_JZCODEC - FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-jzcodec.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-jzcodec.ko AUTOLOAD:=$(call AutoLoad,60,snd-soc-jzcodec) endef @@ -27,7 +27,7 @@ define KernelPackage/sound-soc-xburst/default DEPENDS:=kmod-sound-soc-jz4740 kmod-sound-soc-jzcodec @TARGET_xburst_$(if $(4),$(4),$(3)) TITLE:=$(1) sound support KCONFIG:=CONFIG_SND_JZ4740_SOC_$(2) - FILES:=$(LINUX_DIR)/sound/soc/jz4740/snd-soc-$(3).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/sound/soc/jz4740/snd-soc-$(3).ko AUTOLOAD:=$(call AutoLoad,65,snd-soc-$(3)) endef -- 2.30.2