summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.config6
-rw-r--r--config-arm-omap (renamed from config-arm-omap-generic)0
-rw-r--r--kernel.spec2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.config b/Makefile.config
index 9f00c576b..c92d986f0 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -40,7 +40,7 @@ temp-debug-generic: config-generic
temp-arm-generic: config-arm-generic temp-generic
perl merge.pl $^ > $@
-temp-armv7l-omap-generic: config-arm-omap-generic temp-arm-generic
+temp-armv7l-omap: config-arm-omap temp-arm-generic
perl merge.pl $^ > $@
temp-armv7l-tegra: config-arm-tegra temp-arm-generic
@@ -136,7 +136,7 @@ kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx
kernel-$(VERSION)-armv7l-highbank.config: /dev/null temp-armv7l-highbank
perl merge.pl $^ arm > $@
-kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap-generic
+kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap
perl merge.pl $^ arm > $@
kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
@@ -148,7 +148,7 @@ kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx
kernel-$(VERSION)-armv7hl-highbank.config: /dev/null temp-armv7l-highbank
perl merge.pl $^ arm > $@
-kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap-generic
+kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap
perl merge.pl $^ arm > $@
kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra
diff --git a/config-arm-omap-generic b/config-arm-omap
index 772121b45..772121b45 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap
diff --git a/kernel.spec b/kernel.spec
index 12596c288..19c935481 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -586,7 +586,7 @@ Source70: config-s390x
Source90: config-sparc64-generic
Source100: config-arm-generic
-Source110: config-arm-omap-generic
+Source110: config-arm-omap
Source111: config-arm-tegra
Source112: config-arm-kirkwood
Source113: config-arm-imx