diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 121cca2..54fa9b8 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -6,9 +6,6 @@
 config HAVE_AT91_USB_CLK
 	bool
 
-config HAVE_AT91_PIO4
-	bool
-
 config COMMON_CLK_AT91
 	bool
 	select COMMON_CLK
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index e922880..220b635 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -19,9 +19,6 @@
 menu "OMAP Features"
 	depends on ARCH_OMAP
 
-config MACH_OMAP
-	bool
-
 config ARCH_OMAP3
 	bool
 	select CPU_V7
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 160732f..f144d34 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -4,9 +4,6 @@
 	hex
 	default 0x0
 
-config BOARDINFO
-	default ""
-
 # ---------------------------------------------------------
 
 config ARCH_TEGRA_2x_SOC
diff --git a/common/Kconfig b/common/Kconfig
index 400c055..c594f9c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -145,9 +145,6 @@
 
 	  which is done within the script "scripts/setlocalversion".)
 
-config BOARDINFO
-	string
-
 config BANNER
 	bool "display banner"
 	default y
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index fd75ea6..4f05f5d 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -93,8 +93,6 @@
 	  The pinmux controller found on the Tegra 124 line of SoCs used for
 	  the SerDes lanes.
 
-source "drivers/pinctrl/mvebu/Kconfig"
-
 config PINCTRL_VF610
 	bool
 	default y if ARCH_VF610
diff --git a/drivers/pinctrl/mvebu/Kconfig b/drivers/pinctrl/mvebu/Kconfig
deleted file mode 100644
index af20cad..0000000
--- a/drivers/pinctrl/mvebu/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-config PINCTRL_ARMADA_370
-	default y if ARCH_ARMADA_370
-	bool
-
-config PINCTRL_ARMADA_XP
-	bool
-	default y if ARCH_ARMADA_XP
-
-config PINCTRL_DOVE
-	bool
-	default y if ARCH_DOVE
-
-config PINCTRL_KIRKWOOD
-	bool
-	default y if ARCH_KIRKWOOD