 0bd3fbd4ab
			
		
	
	
	0bd3fbd4ab
	
	
	
		
			
			Pull crypto updates from Herbert Xu:
 - New cipher/hash driver for ARM ux500.
 - Code clean-up for aesni-intel.
 - Misc fixes.
Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
frankly some of it made no sense at all (the pull brought in a
declaration for the dbx500_add_platform_device_noirq() function, which
neither exists nor is used anywhere).
Also some trivial add-add context conflicts in the Kconfig file in
drivers/{char/hw_random,crypto}/
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni-intel - move more common code to ablk_init_common
  crypto: aesni-intel - use crypto_[un]register_algs
  crypto: ux500 - Cleanup hardware identification
  crypto: ux500 - Update DMA handling for 3.4
  mach-ux500: crypto - core support for CRYP/HASH module.
  crypto: ux500 - Add driver for HASH hardware
  crypto: ux500 - Add driver for CRYP hardware
  hwrng: Kconfig - modify default state for atmel-rng driver
  hwrng: omap - use devm_request_and_ioremap
  crypto: crypto4xx - move up err_request_irq label
  crypto, xor: Sanitize checksumming function selection output
  crypto: caam - add backward compatible string sec4.0
		
	
			
		
			
				
	
	
		
			23 lines
		
	
	
	
		
			528 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			23 lines
		
	
	
	
		
			528 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (C) ST-Ericsson SA 2010
 | |
|  *
 | |
|  * License terms: GNU General Public License (GPL) version 2
 | |
|  */
 | |
| 
 | |
| #ifndef __ASM_ARCH_DEVICES_H__
 | |
| #define __ASM_ARCH_DEVICES_H__
 | |
| 
 | |
| struct platform_device;
 | |
| struct amba_device;
 | |
| 
 | |
| extern struct platform_device u8500_gpio_devs[];
 | |
| 
 | |
| extern struct amba_device ux500_pl031_device;
 | |
| 
 | |
| extern struct platform_device ux500_hash1_device;
 | |
| extern struct platform_device ux500_cryp1_device;
 | |
| 
 | |
| extern struct platform_device u8500_dma40_device;
 | |
| extern struct platform_device ux500_ske_keypad_device;
 | |
| 
 | |
| #endif
 |