diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-07-06 15:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 15:38:36 +0200 |
| commit | 92268c84ffaf80de6913439b81a0649103c8c04f (patch) | |
| tree | 6bdd3db80366a2e02459edd6221fe05a834f9e04 | |
| parent | 70069b0f57bb2f1721fbf8393985c13c7800f66f (diff) | |
| parent | bd95bc6be6487ac41220023e0b4798f78dfb902d (diff) | |
| download | master-187ad058-92268c84ffaf80de6913439b81a0649103c8c04f.tar.gz master-187ad058-92268c84ffaf80de6913439b81a0649103c8c04f.tar.bz2 master-187ad058-92268c84ffaf80de6913439b81a0649103c8c04f.zip | |
Merge pull request #22 from wigyori/master
add missing symbols caused by earlier addition of virtio modules
| -rw-r--r-- | package/kernel/linux/modules/other.mk | 3 | ||||
| -rw-r--r-- | target/linux/generic/config-3.18 | 6 | ||||
| -rw-r--r-- | target/linux/generic/config-4.1 | 6 | ||||
| -rw-r--r-- | target/linux/generic/config-4.4 | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 42b45ba893..cef14106d4 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -995,7 +995,7 @@ $(eval $(call KernelPackage,echo)) define KernelPackage/bmp085 SUBMENU:=$(OTHER_MENU) TITLE:=BMP085/BMP18x pressure sensor - DEPENDS:= +kmod-regmap + DEPENDS:= +kmod-regmap @!LINUX_4_1 @!LINUX_3_18 KCONFIG:= CONFIG_BMP085 FILES:= $(LINUX_DIR)/drivers/misc/bmp085.ko endef @@ -1042,6 +1042,7 @@ $(eval $(call KernelPackage,bmp085-spi)) define KernelPackage/virtio-pci SUBMENU:=$(OTHER_MENU) + DEPENDS:= @PCI_SUPPORT TITLE:=Virtio PCI support KCONFIG:= CONFIG_VIRTIO CONFIG_VIRTIO_PCI FILES:=\ diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18 index 3ed9a28df0..b4e283efe0 100644 --- a/target/linux/generic/config-3.18 +++ b/target/linux/generic/config-3.18 @@ -1337,6 +1337,7 @@ CONFIG_HW_PERF_EVENTS=y # CONFIG_HW_RANDOM_PPC4XX is not set # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_VIA is not set +# CONFIG_HW_RANDOM_VIRTIO is not set # CONFIG_HYPERV is not set # CONFIG_HYSDN is not set CONFIG_HZ=100 @@ -4516,8 +4517,13 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIRQ_DEBUG is not set # CONFIG_VIRTIO_BALLOON is not set +# CONFIG_VIRTIO_BLK is not set +# CONFIG_VIRTIO_CONSOLE is not set # CONFIG_VIRTIO_MMIO is not set +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +# CONFIG_VIRTIO_NET is not set # CONFIG_VIRTIO_PCI is not set +# CONFIG_VIRTIO_PCI_LEGACY is not set # CONFIG_VIRTUALIZATION is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_DRIVERS is not set diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1 index abfa7dc0d0..eb2c249cb0 100644 --- a/target/linux/generic/config-4.1 +++ b/target/linux/generic/config-4.1 @@ -1385,6 +1385,7 @@ CONFIG_HW_PERF_EVENTS=y # CONFIG_HW_RANDOM_PPC4XX is not set # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_VIA is not set +# CONFIG_HW_RANDOM_VIRTIO is not set # CONFIG_HYPERV is not set # CONFIG_HYSDN is not set CONFIG_HZ=100 @@ -4691,9 +4692,14 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIRQ_DEBUG is not set # CONFIG_VIRTIO_BALLOON is not set +# CONFIG_VIRTIO_BLK is not set +# CONFIG_VIRTIO_CONSOLE is not set # CONFIG_VIRTIO_INPUT is not set # CONFIG_VIRTIO_MMIO is not set +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +# CONFIG_VIRTIO_NET is not set # CONFIG_VIRTIO_PCI is not set +# CONFIG_VIRTIO_PCI_LEGACY is not set # CONFIG_VIRTUALIZATION is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_DRIVERS is not set diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 1afaaca125..62c1302a63 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -955,6 +955,7 @@ CONFIG_DOUBLEFAULT=y CONFIG_DQL=y # CONFIG_DRAGONRISE_FF is not set # CONFIG_DRM is not set +# CONFIG_DRM_VIRTIO_GPU is not set # CONFIG_DS1682 is not set # CONFIG_DTLK is not set # CONFIG_DUMMY is not set |