kernel: set WATCHDOG_CORE dependency in kmod-hwmon-sch5627
For many target we have added CONFIG_WATCHDOG_CORE=y to the target config due to the following error: Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: watchdog.ko However, actually the proper way appears to be setting the dependency for the kmod-hwmon-sch5627 package, as the error message demands. Do this in this patch and remove the target config entries added due to this issue. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
		| @@ -409,7 +409,9 @@ $(eval $(call KernelPackage,hwmon-pwmfan)) | |||||||
|  |  | ||||||
| define KernelPackage/hwmon-sch5627 | define KernelPackage/hwmon-sch5627 | ||||||
|   TITLE:=SMSC SCH5627 monitoring support |   TITLE:=SMSC SCH5627 monitoring support | ||||||
|   KCONFIG:=CONFIG_SENSORS_SCH5627 |   KCONFIG:= \ | ||||||
|  | 	CONFIG_SENSORS_SCH5627 \ | ||||||
|  | 	CONFIG_WATCHDOG_CORE=y | ||||||
|   FILES:= \ |   FILES:= \ | ||||||
| 	$(LINUX_DIR)/drivers/hwmon/sch5627.ko \ | 	$(LINUX_DIR)/drivers/hwmon/sch5627.ko \ | ||||||
| 	$(LINUX_DIR)/drivers/hwmon/sch56xx-common.ko | 	$(LINUX_DIR)/drivers/hwmon/sch56xx-common.ko | ||||||
|   | |||||||
| @@ -196,4 +196,3 @@ CONFIG_TIMER_PROBE=y | |||||||
| CONFIG_TREE_SRCU=y | CONFIG_TREE_SRCU=y | ||||||
| CONFIG_UNINLINE_SPIN_UNLOCK=y | CONFIG_UNINLINE_SPIN_UNLOCK=y | ||||||
| CONFIG_USB_SUPPORT=y | CONFIG_USB_SUPPORT=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
|   | |||||||
| @@ -237,5 +237,4 @@ CONFIG_VIRTIO_MMIO=y | |||||||
| CONFIG_VIRTIO_NET=y | CONFIG_VIRTIO_NET=y | ||||||
| CONFIG_VIRTIO_PCI=y | CONFIG_VIRTIO_PCI=y | ||||||
| CONFIG_VIRTIO_PCI_LEGACY=y | CONFIG_VIRTIO_PCI_LEGACY=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| CONFIG_XPS=y | CONFIG_XPS=y | ||||||
|   | |||||||
| @@ -245,4 +245,3 @@ CONFIG_TICK_CPU_ACCOUNTING=y | |||||||
| CONFIG_TINY_SRCU=y | CONFIG_TINY_SRCU=y | ||||||
| CONFIG_USB_SUPPORT=y | CONFIG_USB_SUPPORT=y | ||||||
| CONFIG_USE_OF=y | CONFIG_USE_OF=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
|   | |||||||
| @@ -277,6 +277,5 @@ CONFIG_TINY_SRCU=y | |||||||
| CONFIG_USB_SUPPORT=y | CONFIG_USB_SUPPORT=y | ||||||
| CONFIG_USE_OF=y | CONFIG_USE_OF=y | ||||||
| CONFIG_VM_EVENT_COUNTERS=y | CONFIG_VM_EVENT_COUNTERS=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| CONFIG_WATCHDOG_NOWAYOUT=y | CONFIG_WATCHDOG_NOWAYOUT=y | ||||||
| CONFIG_WEAK_ORDERING=y | CONFIG_WEAK_ORDERING=y | ||||||
|   | |||||||
| @@ -340,5 +340,4 @@ CONFIG_VT=y | |||||||
| CONFIG_VT_CONSOLE=y | CONFIG_VT_CONSOLE=y | ||||||
| CONFIG_VT_HW_CONSOLE_BINDING=y | CONFIG_VT_HW_CONSOLE_BINDING=y | ||||||
| CONFIG_VXFS_FS=y | CONFIG_VXFS_FS=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| CONFIG_XPS=y | CONFIG_XPS=y | ||||||
|   | |||||||
| @@ -121,7 +121,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y | |||||||
| CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | ||||||
| CONFIG_VIA_RHINE=y | CONFIG_VIA_RHINE=y | ||||||
| CONFIG_VIA_RHINE_MMIO=y | CONFIG_VIA_RHINE_MMIO=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| # CONFIG_WDT is not set | # CONFIG_WDT is not set | ||||||
| # CONFIG_X86_ACPI_CPUFREQ is not set | # CONFIG_X86_ACPI_CPUFREQ is not set | ||||||
| # CONFIG_X86_AMD_PLATFORM_DEVICE is not set | # CONFIG_X86_AMD_PLATFORM_DEVICE is not set | ||||||
|   | |||||||
| @@ -121,7 +121,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y | |||||||
| CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | ||||||
| CONFIG_VIA_RHINE=y | CONFIG_VIA_RHINE=y | ||||||
| CONFIG_VIA_RHINE_MMIO=y | CONFIG_VIA_RHINE_MMIO=y | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| # CONFIG_WDT is not set | # CONFIG_WDT is not set | ||||||
| # CONFIG_X86_ACPI_CPUFREQ is not set | # CONFIG_X86_ACPI_CPUFREQ is not set | ||||||
| # CONFIG_X86_AMD_PLATFORM_DEVICE is not set | # CONFIG_X86_AMD_PLATFORM_DEVICE is not set | ||||||
|   | |||||||
| @@ -206,7 +206,6 @@ CONFIG_USB_STORAGE=y | |||||||
| CONFIG_VGACON_SOFT_SCROLLBACK=y | CONFIG_VGACON_SOFT_SCROLLBACK=y | ||||||
| # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set | # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set | ||||||
| CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| # CONFIG_WDT is not set | # CONFIG_WDT is not set | ||||||
| CONFIG_X86_ACPI_CPUFREQ=y | CONFIG_X86_ACPI_CPUFREQ=y | ||||||
| # CONFIG_X86_ACPI_CPUFREQ_CPB is not set | # CONFIG_X86_ACPI_CPUFREQ_CPB is not set | ||||||
|   | |||||||
| @@ -206,7 +206,6 @@ CONFIG_USB_STORAGE=y | |||||||
| CONFIG_VGACON_SOFT_SCROLLBACK=y | CONFIG_VGACON_SOFT_SCROLLBACK=y | ||||||
| # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set | # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set | ||||||
| CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | ||||||
| CONFIG_WATCHDOG_CORE=y |  | ||||||
| # CONFIG_WDT is not set | # CONFIG_WDT is not set | ||||||
| CONFIG_X86_ACPI_CPUFREQ=y | CONFIG_X86_ACPI_CPUFREQ=y | ||||||
| # CONFIG_X86_ACPI_CPUFREQ_CPB is not set | # CONFIG_X86_ACPI_CPUFREQ_CPB is not set | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Adrian Schmutzler
					Adrian Schmutzler