3 files changed, 15 insertions, 172 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 0383d253a3..752a61ccb3 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -53,7 +53,7 @@ run_ramfs() { # <command> [...]
 		/bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump		\
 		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
 		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
-		/bin/rm /usr/bin/basename /bin/kill /bin/chmod
+		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find
 
 	install_bin /bin/uclient-fetch /bin/wget
 	install_bin /sbin/mtd
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 93d7a775a9..f7c305ddb9 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -93,6 +93,20 @@ endef
 $(eval $(call KernelPackage,hwmon-ina2xx))
 
 
+define KernelPackage/hwmon-it87
+  TITLE:=IT87 monitoring support
+  KCONFIG:=CONFIG_SENSORS_IT87
+  FILES:=$(LINUX_DIR)/drivers/hwmon/it87.ko
+  AUTOLOAD:=$(call AutoProbe,it87)
+  $(call AddDepends/hwmon,+kmod-i2c-core +kmod-hwmon-vid +PACKAGE_kmod-thermal:kmod-thermal)
+endef
+
+define KernelPackage/hwmon-it87/description
+ Kernel module for it87 thermal and voltage monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-it87))
+
 define KernelPackage/hwmon-lm63
   TITLE:=LM63/64 monitoring support
   KCONFIG:=CONFIG_SENSORS_LM63
diff --git a/package/kernel/linux/modules/virtual.mk b/package/kernel/linux/modules/virtual.mk
deleted file mode 100644
index 61a8a87609..0000000000
--- a/package/kernel/linux/modules/virtual.mk
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-VIRTUAL_MENU:=Virtualization Support
-
-define KernelPackage/virtio-balloon
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=VirtIO balloon driver
-  DEPENDS:=@TARGET_x86_kvm_guest
-  KCONFIG:=CONFIG_VIRTIO_BALLOON
-  FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko
-  AUTOLOAD:=$(call AutoLoad,06,virtio-balloon)
-endef
-
-define KernelPackage/virtio-balloon/description
- Kernel module for VirtIO memory ballooning support
-endef
-
-$(eval $(call KernelPackage,virtio-balloon))
-
-
-define KernelPackage/virtio-net
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=VirtIO network driver
-  DEPENDS:=@TARGET_x86_kvm_guest
-  KCONFIG:=CONFIG_VIRTIO_NET
-  FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko
-  AUTOLOAD:=$(call AutoLoad,50,virtio_net)
-endef
-
-define KernelPackage/virtio-net/description
- Kernel module for the VirtIO paravirtualized network device
-endef
-
-$(eval $(call KernelPackage,virtio-net))
-
-
-define KernelPackage/virtio-random
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=VirtIO Random Number Generator support
-  DEPENDS:=@TARGET_x86_kvm_guest
-  KCONFIG:=CONFIG_HW_RANDOM_VIRTIO
-  FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko
-  AUTOLOAD:=$(call AutoLoad,09,virtio-rng)
-endef
-
-define KernelPackage/virtio-random/description
- Kernel module for the VirtIO Random Number Generator
-endef
-
-$(eval $(call KernelPackage,virtio-random))
-
-
-define KernelPackage/xen-privcmd
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen private commands
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_PRIVCMD
-  FILES:=$(LINUX_DIR)/drivers/xen/xen-privcmd.ko
-  AUTOLOAD:=$(call AutoLoad,04,xen-privcmd)
-endef
-
-define KernelPackage/xen-privcmd/description
- Kernel module for Xen private commands
-endef
-
-$(eval $(call KernelPackage,xen-privcmd))
-
-
-define KernelPackage/xen-fs
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen filesystem
-  DEPENDS:=@TARGET_x86_xen_domu +kmod-xen-privcmd
-  KCONFIG:= \
-  	CONFIG_XENFS \
-  	CONFIG_XEN_COMPAT_XENFS=y
-  FILES:=$(LINUX_DIR)/drivers/xen/xenfs/xenfs.ko
-  AUTOLOAD:=$(call AutoLoad,05,xenfs)
-endef
-
-define KernelPackage/xen-fs/description
- Kernel module for the Xen filesystem
-endef
-
-$(eval $(call KernelPackage,xen-fs))
-
-
-define KernelPackage/xen-evtchn
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen event channels
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_DEV_EVTCHN
-  FILES:=$(LINUX_DIR)/drivers/xen/xen-evtchn.ko
-  AUTOLOAD:=$(call AutoLoad,06,xen-evtchn)
-endef
-
-define KernelPackage/xen-evtchn/description
- Kernel module for the /dev/xen/evtchn device
-endef
-
-$(eval $(call KernelPackage,xen-evtchn))
-
-define KernelPackage/xen-fbdev
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen virtual frame buffer
-  DEPENDS:=@TARGET_x86_xen_domu +kmod-fb
-  KCONFIG:= \
-  	CONFIG_XEN_FBDEV_FRONTEND \
-  	CONFIG_FB_DEFERRED_IO=y \
-  	CONFIG_FB_SYS_COPYAREA \
-  	CONFIG_FB_SYS_FILLRECT \
-  	CONFIG_FB_SYS_FOPS \
-  	CONFIG_FB_SYS_IMAGEBLIT \
-  	CONFIG_FIRMWARE_EDID=n
-  FILES:= \
-  	$(LINUX_DIR)/drivers/video/fbdev/xen-fbfront.ko \
-  	$(LINUX_DIR)/drivers/video/fbdev/core/syscopyarea.ko \
-  	$(LINUX_DIR)/drivers/video/fbdev/core/sysfillrect.ko \
-  	$(LINUX_DIR)/drivers/video/fbdev/core/fb_sys_fops.ko \
-  	$(LINUX_DIR)/drivers/video/fbdev/core/sysimgblt.ko
-  AUTOLOAD:=$(call AutoLoad,07, \
-  	fb \
-  	syscopyarea \
-  	sysfillrect \
-  	fb_sys_fops \
-  	sysimgblt \
-  	xen-fbfront \
-  )
-endef
-
-define KernelPackage/xen-fbdev/description
- Kernel module for the Xen virtual frame buffer
-endef
-
-$(eval $(call KernelPackage,xen-fbdev))
-
-
-define KernelPackage/xen-netdev
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen network device frontend
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_NETDEV_FRONTEND
-  FILES:=$(LINUX_DIR)/drivers/net/xen-netfront.ko
-  AUTOLOAD:=$(call AutoLoad,09,xen-netfront)
-endef
-
-define KernelPackage/xen-netdev/description
- Kernel module for the Xen network device frontend
-endef
-
-$(eval $(call KernelPackage,xen-netdev))
-
-
-define KernelPackage/xen-pcidev
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen PCI device frontend
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND
-  FILES:=$(LINUX_DIR)/drivers/pci/xen-pcifront.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))