kernel: disbale HAMRADIO in generic config

[openwrt/staging/yousong.git] / target / linux / kirkwood / config-3.18

diff --git a/target/linux/kirkwood/config-3.18 b/target/linux/kirkwood/config-3.18
index b820597592669829bfc6f46becf9347749e5392a..a1f726526ac6284385272c52326e7c1e446b085c 100644 (file)
--- a/target/linux/kirkwood/config-3.18
+++ b/target/linux/kirkwood/config-3.18
@@ -116,7 +116,6 @@ CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_SYSFS=y
-# CONFIG_HAMRADIO is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
@@ -171,7 +170,6 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_INET_LRO=y
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PIMSM_V1=y
@@ -219,7 +217,7 @@ CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_MVEBU_MBUS=y
 CONFIG_MVMDIO=y
 # CONFIG_MVNETA is not set
-CONFIG_MVSW6171_PHY=y
+CONFIG_MVSW61XX_PHY=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_KUSER_HELPERS=y
 CONFIG_NEED_PER_CPU_KM=y
@@ -277,7 +275,6 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_RFKILL_REGULATOR is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_MV is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y