diff options
| author | vdumpa <vdumpa@nvidia.com> | 2010-05-19 15:43:31 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-05-20 17:49:42 -0700 |
| commit | 1b0b9bb2adac5af3422364a64c627e3bf1741672 (patch) | |
| tree | 57f01d611736f42dfb55fee7825f276c3db814eb | |
| parent | 754f91b0662286cf37916bca72444e7521eb4f0a (diff) | |
tegra kernel: Fixed version mismatch error.
Bug 687750
Fixed version mismatch error between prebuilt kernel modules
and locally built zImage files.
Change-Id: Ia7d2f08270eab00d94359e085e807d15cb43b86a
Reviewed-on: http://git-master/r/1446
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra_harmony_gnu_linux_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_whistler_gnu_linux_defconfig | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig index 45a2d7519d04..aa19ed593d05 100644 --- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29 -# Fri Apr 23 16:48:35 2010 +# Wed May 19 15:27:30 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -205,6 +205,7 @@ CONFIG_TEGRA_ODM_RFKILL=y CONFIG_TEGRA_NVEC=y CONFIG_TEGRA_NVEC_USER=y # CONFIG_TEGRA_PCI is not set +# CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU is not set CONFIG_TEGRA_ODM_HARMONY=y # CONFIG_TEGRA_ODM_WHISTLER is not set # CONFIG_TEGRA_ODM_CONCORDE is not set diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig index 1b6d00d4652d..ef0d4da062cd 100644 --- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig @@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y |