diff options
| author | Michal Simek <[email protected]> | 2012-03-30 12:10:03 +0200 |
|---|---|---|
| committer | Michal Simek <[email protected]> | 2012-03-30 12:10:03 +0200 |
| commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
| tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/arm/include/asm/hardware/cache-l2x0.h | |
| parent | ac64a9caa55bdfd8d24784f25c68cb7919ddabe3 (diff) | |
| parent | f52b69f86e27903d6896ed5fa7cd280fec8de532 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/arm/include/asm/hardware/cache-l2x0.h')
| -rw-r--r-- | arch/arm/include/asm/hardware/cache-l2x0.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h index 7df239bcdf27..c4c87bc12231 100644 --- a/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/arch/arm/include/asm/hardware/cache-l2x0.h @@ -103,11 +103,11 @@ #define L2X0_ADDR_FILTER_EN 1 #ifndef __ASSEMBLY__ -extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask); +extern void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask); #if defined(CONFIG_CACHE_L2X0) && defined(CONFIG_OF) -extern int l2x0_of_init(__u32 aux_val, __u32 aux_mask); +extern int l2x0_of_init(u32 aux_val, u32 aux_mask); #else -static inline int l2x0_of_init(__u32 aux_val, __u32 aux_mask) +static inline int l2x0_of_init(u32 aux_val, u32 aux_mask) { return -ENODEV; } |