package/mac80211: fix atomic64 issues on x86 / uml

[openwrt.git] / package / kernel / modules / virtual.mk

diff --git a/package/kernel/modules/virtual.mk b/package/kernel/modules/virtual.mk
index c129820..05eb496 100644 (file)
--- a/package/kernel/modules/virtual.mk
+++ b/package/kernel/modules/virtual.mk
@@ -11,9 +11,9 @@ VIRTUAL_MENU:=Virtualization Support
 define KernelPackage/virtio-balloon
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=VirtIO balloon driver
 define KernelPackage/virtio-balloon
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=VirtIO balloon driver

-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86_kvm_guest

   KCONFIG:=CONFIG_VIRTIO_BALLOON
   KCONFIG:=CONFIG_VIRTIO_BALLOON

-  FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko

   AUTOLOAD:=$(call AutoLoad,06,virtio-balloon)
 endef
 
   AUTOLOAD:=$(call AutoLoad,06,virtio-balloon)
 endef
 


@@ -27,9 +27,9 @@ $(eval $(call KernelPackage,virtio-balloon))
 define KernelPackage/virtio-net
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=VirtIO network driver
 define KernelPackage/virtio-net
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=VirtIO network driver

-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86_kvm_guest

   KCONFIG:=CONFIG_VIRTIO_NET
   KCONFIG:=CONFIG_VIRTIO_NET

-  FILES:=$(LINUX_DIR)/drivers/net/virtio_net.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko

   AUTOLOAD:=$(call AutoLoad,50,virtio_net)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,virtio_net)
 endef
 


@@ -43,9 +43,9 @@ $(eval $(call KernelPackage,virtio-net))
 define KernelPackage/virtio-random
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=VirtIO Random Number Generator support
 define KernelPackage/virtio-random
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=VirtIO Random Number Generator support

-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86_kvm_guest

   KCONFIG:=CONFIG_HW_RANDOM_VIRTIO
   KCONFIG:=CONFIG_HW_RANDOM_VIRTIO

-  FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko

   AUTOLOAD:=$(call AutoLoad,09,virtio-rng)
 endef
 
   AUTOLOAD:=$(call AutoLoad,09,virtio-rng)
 endef
 


@@ -78,8 +78,13 @@ define KernelPackage/xen-evtchn
   TITLE:=Xen event channels
   DEPENDS:=@TARGET_x86_xen_domu
   KCONFIG:=CONFIG_XEN_DEV_EVTCHN
   TITLE:=Xen event channels
   DEPENDS:=@TARGET_x86_xen_domu
   KCONFIG:=CONFIG_XEN_DEV_EVTCHN

-  FILES:=$(LINUX_DIR)/drivers/xen/evtchn.ko
-  AUTOLOAD:=$(call AutoLoad,06,evtchn)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1)
+    FILES:=$(LINUX_DIR)/drivers/xen/xen-evtchn.ko
+    AUTOLOAD:=$(call AutoLoad,06,xen-evtchn)
+  else
+    FILES:=$(LINUX_DIR)/drivers/xen/evtchn.ko
+    AUTOLOAD:=$(call AutoLoad,06,evtchn)
+  endif

 endef
 
 define KernelPackage/xen-evtchn/description
 endef
 
 define KernelPackage/xen-evtchn/description


@@ -156,3 +161,19 @@ define KernelPackage/xen-netdev/description
 endef
 
 $(eval $(call KernelPackage,xen-netdev))
 endef
 
 $(eval $(call KernelPackage,xen-netdev))

+
+
+define KernelPackage/xen-pcidev
+  SUBMENU:=$(VIRTUAL_MENU)
+  TITLE:=Xen PCI device frontend
+  DEPENDS:=@TARGET_x86_xen_domu @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36
+  KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND
+  FILES:=$(LINUX_DIR)/drivers/xen/platform-pci.ko
+  AUTOLOAD:=$(call AutoLoad,10,xen-pcifront)
+endef
+
+define KernelPackage/xen-pcidev/description
+  Kernel module for the Xen network device frontend
+endef
+
+$(eval $(call KernelPackage,xen-pcidev))