diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
| commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 (patch) | |
| tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 /drivers/tty/hvc/hvc_opal.c | |
| parent | f9a4f063a88297e361fd6676986cf3e39b22de72 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge tag 'v3.5-rc7' into arm/tegra
This solves the merge conflicts while creating the next
branch.
Linux 3.5-rc7
Conflicts:
drivers/iommu/tegra-smmu.c
Diffstat (limited to 'drivers/tty/hvc/hvc_opal.c')
| -rw-r--r-- | drivers/tty/hvc/hvc_opal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c index ced26c8ccd57..0d2ea0c224c3 100644 --- a/drivers/tty/hvc/hvc_opal.c +++ b/drivers/tty/hvc/hvc_opal.c @@ -401,7 +401,7 @@ out: } #ifdef CONFIG_PPC_EARLY_DEBUG_OPAL_RAW -void __init udbg_init_debug_opal(void) +void __init udbg_init_debug_opal_raw(void) { u32 index = CONFIG_PPC_EARLY_DEBUG_OPAL_VTERMNO; hvc_opal_privs[index] = &hvc_opal_boot_priv; |