diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /arch/powerpc/include/asm/fsl_guts.h | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'arch/powerpc/include/asm/fsl_guts.h')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_guts.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/fsl_guts.h b/arch/powerpc/include/asm/fsl_guts.h index dd5ba2c22771..77ced0b3d81d 100644 --- a/arch/powerpc/include/asm/fsl_guts.h +++ b/arch/powerpc/include/asm/fsl_guts.h | |||
| @@ -71,7 +71,9 @@ struct ccsr_guts { | |||
| 71 | u8 res0c4[0x224 - 0xc4]; | 71 | u8 res0c4[0x224 - 0xc4]; |
| 72 | __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */ | 72 | __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */ |
| 73 | __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */ | 73 | __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */ |
| 74 | u8 res22c[0x800 - 0x22c]; | 74 | u8 res22c[0x604 - 0x22c]; |
| 75 | __be32 pamubypenr; /* 0x.604 - PAMU bypass enable register */ | ||
| 76 | u8 res608[0x800 - 0x608]; | ||
| 75 | __be32 clkdvdr; /* 0x.0800 - Clock Divide Register */ | 77 | __be32 clkdvdr; /* 0x.0800 - Clock Divide Register */ |
| 76 | u8 res804[0x900 - 0x804]; | 78 | u8 res804[0x900 - 0x804]; |
| 77 | __be32 ircr; /* 0x.0900 - Infrared Control Register */ | 79 | __be32 ircr; /* 0x.0900 - Infrared Control Register */ |