From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 21:46:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.35-rc1~446
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=2a8ba8f032160552a3beffab8aae9019ff477504

Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)
  random: simplify fips mode
  crypto: authenc - Fix cryptlen calculation
  crypto: talitos - add support for sha224
  crypto: talitos - add hash algorithms
  crypto: talitos - second prepare step for adding ahash algorithms
  crypto: talitos - prepare for adding ahash algorithms
  crypto: n2 - Add Niagara2 crypto driver
  crypto: skcipher - Add ablkcipher_walk interfaces
  crypto: testmgr - Add testing for async hashing and update/final
  crypto: tcrypt - Add speed tests for async hashing
  crypto: scatterwalk - Fix scatterwalk_done() test
  crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
  padata: Use get_online_cpus/put_online_cpus in padata_free
  padata: Add some code comments
  padata: Flush the padata queues actively
  padata: Use a timer to handle remaining objects in the reorder queues
  crypto: shash - Remove usage of CRYPTO_MINALIGN
  crypto: mv_cesa - Use resource_size
  crypto: omap - OMAP macros corrected
  padata: Use get_online_cpus/put_online_cpus
  ...

Fix up conflicts in arch/arm/mach-omap2/devices.c
---

2a8ba8f032160552a3beffab8aae9019ff477504
diff --cc arch/arm/mach-omap2/devices.c
index 705a7a30a87f,79dbf04cbaaf..03e6c9ed82a4
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -455,39 -454,10 +456,41 @@@ static void omap_init_mcspi(void
  static inline void omap_init_mcspi(void) {}
  #endif
  
 +static struct resource omap2_pmu_resource = {
 +	.start	= 3,
 +	.end	= 3,
 +	.flags	= IORESOURCE_IRQ,
 +};
 +
 +static struct resource omap3_pmu_resource = {
 +	.start	= INT_34XX_BENCH_MPU_EMUL,
 +	.end	= INT_34XX_BENCH_MPU_EMUL,
 +	.flags	= IORESOURCE_IRQ,
 +};
 +
 +static struct platform_device omap_pmu_device = {
 +	.name		= "arm-pmu",
 +	.id		= ARM_PMU_DEVICE_CPU,
 +	.num_resources	= 1,
 +};
 +
 +static void omap_init_pmu(void)
 +{
 +	if (cpu_is_omap24xx())
 +		omap_pmu_device.resource = &omap2_pmu_resource;
 +	else if (cpu_is_omap34xx())
 +		omap_pmu_device.resource = &omap3_pmu_resource;
 +	else
 +		return;
 +
 +	platform_device_register(&omap_pmu_device);
 +}
 +
 +
- #ifdef CONFIG_OMAP_SHA1_MD5
- static struct resource sha1_md5_resources[] = {
+ #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
+ 
+ #ifdef CONFIG_ARCH_OMAP2
+ static struct resource omap2_sham_resources[] = {
  	{
  		.start	= OMAP24XX_SEC_SHA1MD5_BASE,
  		.end	= OMAP24XX_SEC_SHA1MD5_BASE + 0x64,
@@@ -866,11 -835,9 +904,11 @@@ static int __init omap2_init_devices(vo
  	omap_init_camera();
  	omap_init_mbox();
  	omap_init_mcspi();
 +	omap_init_pmu();
  	omap_hdq_init();
  	omap_init_sti();
- 	omap_init_sha1_md5();
+ 	omap_init_sham();
 +	omap_init_vout();
  
  	return 0;
  }