xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers

Browse Source 
Conflicts:
	drivers/crypto/omap-aes.c
	drivers/crypto/omap-sham.c
	drivers/dma/omap-dma.c
This commit is contained in:
Tony Lindgren
2012-10-17 10:01:30 -07:00
parent 27615a97b2 2b6c4e7324
commit 94c657853b
52 changed files with 302 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/omap-aes.c
View File

@@ -29,7 +29,7 @@
#include <crypto/scatterwalk.h>
#include <crypto/aes.h>
#include <plat/dma.h>
#include <plat-omap/dma-omap.h>
/* OMAP TRM gives bitfields as start:end, where start is the higher bit
number. For example 7:0 */

2
drivers/crypto/omap-sham.c
View File

@@ -37,7 +37,7 @@
#include <crypto/hash.h>
#include <crypto/internal/hash.h>
#include <plat/dma.h>
#include <plat-omap/dma-omap.h>
#include <mach/irqs.h>
#define SHA_REG_DIGEST(x) (0x00 + ((x) * 0x04))