summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.config5
-rw-r--r--arm-tegra-sdhci-module-fix.patch11
-rw-r--r--kernel.spec6
3 files changed, 18 insertions, 4 deletions
diff --git a/Makefile.config b/Makefile.config
index e6b4a5bc5..8c70dae32 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,7 +9,7 @@ CONFIGFILES = \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config \
- $(CFG)-arm.config $(CFG)-armv5tel-kirkwood.config \
+ $(CFG)-armv5tel-kirkwood.config \
$(CFG)-armv7l.config $(CFG)-armv7hl.config \
$(CFG)-armv7l-imx.config $(CFG)-armv7hl-imx.config \
$(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \
@@ -121,9 +121,6 @@ kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generi
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@
-kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
- perl merge.pl $^ arm > $@
-
kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
perl merge.pl $^ arm > $@
diff --git a/arm-tegra-sdhci-module-fix.patch b/arm-tegra-sdhci-module-fix.patch
new file mode 100644
index 000000000..24ba278ed
--- /dev/null
+++ b/arm-tegra-sdhci-module-fix.patch
@@ -0,0 +1,11 @@
+--- linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c.orig 2012-05-23 06:59:19.797302757 -0500
++++ linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c 2012-05-22 15:26:07.154823359 -0500
+@@ -190,7 +190,7 @@
+ #endif
+ {}
+ };
+-MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
++MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);
+
+ static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
+ struct platform_device *pdev)
diff --git a/kernel.spec b/kernel.spec
index 631711f3d..2f15dff32 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -725,6 +725,7 @@ Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
# ARM tegra
Patch21004: arm-tegra-nvec-kconfig.patch
Patch21005: arm-tegra-usb-no-reset-linux33.patch
+Patch21006: arm-tegra-sdhci-module-fix.patch
# ARM highbank patches
# Highbank clock functions need to be EXPORT for module builds
@@ -1315,6 +1316,7 @@ ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
#ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
ApplyPatch arm-tegra-nvec-kconfig.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
+ApplyPatch arm-tegra-sdhci-module-fix.patch
#
# bugfixes to drivers and filesystems
@@ -2297,6 +2299,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed May 23 2012 Dennis Gilmore <dennis@ausil.us>
+- add patch to fix ftbfs on tegra due to sdhci MODULE_DEVICE_TABLE mismatch
+- dont make a arm config file we do not use it anywhere
+
* Tue May 22 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc0.git3.1
- Linux v3.4-2580-g72c04af