projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kernel] rename 014-samsung_flash patch to a better name, thanks maddes
[openwrt.git]
/
package
/
kernel
/
modules
/
block.mk
diff --git
a/package/kernel/modules/block.mk
b/package/kernel/modules/block.mk
index
8a4c68a
..
638ffd3
100644
(file)
--- a/
package/kernel/modules/block.mk
+++ b/
package/kernel/modules/block.mk
@@
-10,9
+10,8
@@
BLOCK_MENU:=Block Devices
define KernelPackage/aoe
SUBMENU:=$(BLOCK_MENU)
TITLE:=ATA over Ethernet support
define KernelPackage/aoe
SUBMENU:=$(BLOCK_MENU)
TITLE:=ATA over Ethernet support
- DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_ATA_OVER_ETH
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
AUTOLOAD:=$(call AutoLoad,30,aoe)
endef
@@
-26,9
+25,9
@@
$(eval $(call KernelPackage,aoe))
define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support
define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support
- DEPENDS:=@PCI_SUPPORT
@LINUX_2_6
+kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86)
+ DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86)
KCONFIG:=CONFIG_ATA
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
AUTOLOAD:=$(call AutoLoad,21,libata,1)
endef
@@
-44,7
+43,7
@@
endef
define KernelPackage/ata-ahci
TITLE:=AHCI Serial ATA support
KCONFIG:=CONFIG_SATA_AHCI
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
AUTOLOAD:=$(call AutoLoad,41,ahci,1)
$(call AddDepends/ata)
endef
@@
-59,7
+58,7
@@
$(eval $(call KernelPackage,ata-ahci))
define KernelPackage/ata-artop
TITLE:=ARTOP 6210/6260 PATA support
KCONFIG:=CONFIG_PATA_ARTOP
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
AUTOLOAD:=$(call AutoLoad,41,pata_artop,1)
$(call AddDepends/ata)
endef
@@
-74,7
+73,7
@@
$(eval $(call KernelPackage,ata-artop))
define KernelPackage/ata-nvidia-sata
TITLE:=Nvidia Serial ATA support
KCONFIG:=CONFIG_SATA_NV
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
AUTOLOAD:=$(call AutoLoad,41,sata_nv,1)
$(call AddDepends/ata)
endef
@@
-89,7
+88,7
@@
define KernelPackage/ata-pdc202xx-old
KCONFIG:= \
CONFIG_ATA_SFF=y \
CONFIG_PATA_PDC_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
AUTOLOAD:=$(call AutoLoad,41,pata_pdc202xx_old,1)
endef
@@
-104,7
+103,7
@@
$(eval $(call KernelPackage,ata-pdc202xx-old))
define KernelPackage/ata-piix
TITLE:=Intel PIIX PATA/SATA support
KCONFIG:=CONFIG_ATA_PIIX
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
AUTOLOAD:=$(call AutoLoad,41,ata_piix,1)
$(call AddDepends/ata)
endef
@@
-120,7
+119,7
@@
$(eval $(call KernelPackage,ata-piix))
define KernelPackage/ata-sil
TITLE:=Silicon Image SATA support
KCONFIG:=CONFIG_SATA_SIL
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
AUTOLOAD:=$(call AutoLoad,41,sata_sil,1)
$(call AddDepends/ata)
endef
@@
-135,7
+134,7
@@
$(eval $(call KernelPackage,ata-sil))
define KernelPackage/ata-sil24
TITLE:=Silicon Image 3124/3132 SATA support
KCONFIG:=CONFIG_SATA_SIL24
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
AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1)
$(call AddDepends/ata)
endef
@@
-150,7
+149,7
@@
$(eval $(call KernelPackage,ata-sil24))
define KernelPackage/ata-via-sata
TITLE:=VIA SATA support
KCONFIG:=CONFIG_SATA_VIA
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
AUTOLOAD:=$(call AutoLoad,41,sata_via,1)
$(call AddDepends/ata)
endef
@@
-165,9
+164,8
@@
$(eval $(call KernelPackage,ata-via-sata))
define KernelPackage/block2mtd
SUBMENU:=$(BLOCK_MENU)
TITLE:=Block device MTD emulation
define KernelPackage/block2mtd
SUBMENU:=$(BLOCK_MENU)
TITLE:=Block device MTD emulation
- DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_MTD_BLOCK2MTD
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))
endef
$(eval $(call KernelPackage,block2mtd))
@@
-176,7
+174,6
@@
$(eval $(call KernelPackage,block2mtd))
define KernelPackage/dm
SUBMENU:=$(BLOCK_MENU)
TITLE:=Device Mapper
define KernelPackage/dm
SUBMENU:=$(BLOCK_MENU)
TITLE:=Device Mapper
- DEPENDS:=@LINUX_2_6
# All the "=n" are unnecessary, they're only there
# to stop the config from asking the question.
# MIRROR is M because I've needed it for pvmove.
# All the "=n" are unnecessary, they're only there
# to stop the config from asking the question.
# MIRROR is M because I've needed it for pvmove.
@@
-193,7
+190,7
@@
define KernelPackage/dm
CONFIG_MD=y \
CONFIG_BLK_DEV_DM \
CONFIG_DM_MIRROR
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
AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror)
endef
@@
-218,15
+215,15
@@
define KernelPackage/ide-core
CONFIG_BLK_DEV_IDEDMA_PCI=y \
CONFIG_BLK_DEV_IDEPCI=y
FILES:= \
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+= \
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)
AUTOLOAD+= \
$(call AutoLoad,35,ide-detect,1) \
$(call AutoLoad,40,ide-disk,1)
@@
-234,7
+231,7
@@
endef
define KernelPackage/ide-core/2.6
FILES+= \
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
AUTOLOAD+= \
$(call AutoLoad,40,ide-gd_mod,1)
endef
@@
-266,14
+263,14
@@
endef
define KernelPackage/ide-generic/2.4
FILES+= \
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+= \
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
AUTOLOAD+= \
$(call AutoLoad,30,ide-pci-generic,1)
endef
@@
-283,10
+280,9
@@
$(eval $(call KernelPackage,ide-generic))
define KernelPackage/ide-generic-old
SUBMENU:=$(BLOCK_MENU)
define KernelPackage/ide-generic-old
SUBMENU:=$(BLOCK_MENU)
- DEPENDS:=@LINUX_2_6
TITLE:=Kernel support for generic (legacy) IDE chipsets
KCONFIG:=CONFIG_IDE_GENERIC
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
AUTOLOAD:=$(call AutoLoad,30,ide-generic,1)
$(call AddDepends/ide)
endef
@@
-298,13
+294,13
@@
define KernelPackage/ide-aec62xx
TITLE:=Acard AEC62xx IDE driver
DEPENDS:=@PCI_SUPPORT
KCONFIG:=CONFIG_BLK_DEV_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
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
endef
define KernelPackage/ide-aec62xx/description
@@
-318,13
+314,13
@@
define KernelPackage/ide-pdc202xx
TITLE:=Promise PDC202xx IDE driver
DEPENDS:=@PCI_SUPPORT
KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
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
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
endef
define KernelPackage/ide-pdc202xx/description
@@
-337,9
+333,9
@@
$(eval $(call KernelPackage,ide-pdc202xx))
define KernelPackage/ide-it821x
TITLE:=ITE IT821x IDE driver
define KernelPackage/ide-it821x
TITLE:=ITE IT821x IDE driver
- DEPENDS:=@
LINUX_2_6 @
PCI_SUPPORT
+ DEPENDS:=@PCI_SUPPORT
KCONFIG:=CONFIG_BLK_DEV_IT821X
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
AUTOLOAD:=$(call AutoLoad,30,it821x,1)
$(call AddDepends/ide)
endef
@@
-361,8
+357,8
@@
define KernelPackage/libsas
CONFIG_SCSI_SAS_HOST_SMP=y \
CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
FILES:= \
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
AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1)
endef
@@
-379,7
+375,7
@@
define KernelPackage/loop
KCONFIG:= \
CONFIG_BLK_DEV_LOOP \
CONFIG_BLK_DEV_CRYPTOLOOP=n
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
AUTOLOAD:=$(call AutoLoad,30,loop)
endef
@@
-396,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),)
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
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
endif
AUTOLOAD:=$(call AutoLoad,40,mvsas,1)
endef
@@
-414,7
+410,7
@@
define KernelPackage/nbd
SUBMENU:=$(BLOCK_MENU)
TITLE:=Network block device support
KCONFIG:=CONFIG_BLK_DEV_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
AUTOLOAD:=$(call AutoLoad,30,nbd)
endef
@@
-433,8
+429,8
@@
define KernelPackage/scsi-core
CONFIG_SCSI \
CONFIG_BLK_DEV_SD
FILES:= \
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
AUTOLOAD:=$(call AutoLoad,20,scsi_mod,1) $(call AutoLoad,40,sd_mod,1)
endef
@@
-447,7
+443,7
@@
define KernelPackage/scsi-generic
KCONFIG:= \
CONFIG_CHR_DEV_SG
FILES:= \
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
AUTOLOAD:=$(call AutoLoad,65,sg)
endef
This page took
0.035262 seconds
and
4
git commands to generate.