diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 21:46:18 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-05 21:46:18 +0100 |
| commit | 3fa04ecd72780da31ba8b329e148179bc24a9c7d (patch) | |
| tree | f5d462fd4aee086952d18f159f737c450ab46b3b /arch/arm/mach-nomadik/cpu-8815.c | |
| parent | nfs41 fix NFS4ERR_CLID_INUSE for exchange id (diff) | |
| parent | NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping (diff) | |
| download | linux-3fa04ecd72780da31ba8b329e148179bc24a9c7d.tar.xz linux-3fa04ecd72780da31ba8b329e148179bc24a9c7d.zip | |
Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
| -rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index f93c59634191..9bf33b30a025 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -86,11 +86,19 @@ static struct amba_device cpu8815_amba_gpio[] = { }, }; +static struct amba_device cpu8815_amba_rng = { + .dev = { + .init_name = "rng", + }, + __MEM_4K_RESOURCE(NOMADIK_RNG_BASE), +}; + static struct amba_device *amba_devs[] __initdata = { cpu8815_amba_gpio + 0, cpu8815_amba_gpio + 1, cpu8815_amba_gpio + 2, cpu8815_amba_gpio + 3, + &cpu8815_amba_rng }; static int __init cpu8815_init(void) |