From dc50b25d28fb6e3e6d8c085e840b4501ce89e1a5 Mon Sep 17 00:00:00 2001 From: Dmitry Kasatkin Date: Fri, 14 May 2010 14:45:08 +1000 Subject: [PATCH] --- yaml --- r: 196727 b: refs/heads/master c: edc774ed0c7d75e92b53105b386a5b0ce94d4525 h: refs/heads/master i: 196725: 9d3d3310a3561a265067cc3632f24e21d1c82abe 196723: ab1dbe4387062441cedea73c692f46642452bfc3 196719: 485262439554f208a7aae5caa11334261cf9909b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/devices.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 785796d2da9a..46cc6969dd7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6751fb3c0e0cfcc40a1a0acabca97370c9ec6c6b +refs/heads/master: edc774ed0c7d75e92b53105b386a5b0ce94d4525 diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c index beac46c48c5a..79dbf04cbaaf 100644 --- a/trunk/arch/arm/mach-omap2/devices.c +++ b/trunk/arch/arm/mach-omap2/devices.c @@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {} #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE) -#ifdef CONFIG_ARCH_OMAP24XX +#ifdef CONFIG_ARCH_OMAP2 static struct resource omap2_sham_resources[] = { { .start = OMAP24XX_SEC_SHA1MD5_BASE, @@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources); #define omap2_sham_resources_sz 0 #endif -#ifdef CONFIG_ARCH_OMAP34XX +#ifdef CONFIG_ARCH_OMAP3 static struct resource omap3_sham_resources[] = { { .start = OMAP34XX_SEC_SHA1MD5_BASE,