diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-14 01:38:09 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-14 01:38:09 +0100 |
| commit | ae0b82504e515fdb9bc23c0b770d2b30efd49dc9 (patch) | |
| tree | 665d1f26b32f9e68346a9529388fbadec519e865 /arch/arm/mach-omap2/id.c | |
| parent | Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: shmobile: remove additional __io() macro use (diff) | |
| download | linux-ae0b82504e515fdb9bc23c0b770d2b30efd49dc9.tar.xz linux-ae0b82504e515fdb9bc23c0b770d2b30efd49dc9.zip | |
Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
ARM: shmobile: remove additional __io() macro use
ARM: mach-shmobile: default to no earlytimer
ARM: mach-shmobile: r8a7779 and Marzen timer rework
ARM: mach-shmobile: r8a7740 and Bonito timer rework
ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
ARM: mach-shmobile: sh7377 and G4EVM timer rework
ARM: mach-shmobile: sh7367 and G3EVM timer rework
ARM: mach-shmobile: add shmobile_earlytimer_init()
ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
ARM: mach-shmobile: r8a7779 L2 cache support
ARM: mach-shmobile: r8a7779 map_io and init_early update
ARM: mach-shmobile: r8a7740 map_io and init_early update
ARM: mach-shmobile: sh73a0 map_io and init_early update
ARM: mach-shmobile: sh7372 map_io and init_early update
ARM: mach-shmobile: sh7377 map_io and init_early update
ARM: mach-shmobile: sh7367 map_io and init_early update
sh: remove clk_ops
...
(includes an update to v3.3-rc7)
Conflicts:
arch/arm/mach-omap2/id.c
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 92e4d5558b1e..c199b173a59c 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -396,6 +396,7 @@ void __init omap3xxx_check_revision(void) case 0xb944: omap_revision = AM335X_REV_ES1_0; cpu_rev = "1.0"; + break; case 0xb8f2: switch (rev) { case 0: |