Merge branch 'clps711x/cleanup' into next/cleanup

A single patch from Alexander Shiyan <[email protected]>:

* clps711x/cleanup:
  ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset

Signed-off-by: Arnd Bergmann <[email protected]>
This commit is contained in:
Arnd Bergmann 2012-05-11 16:18:22 +02:00
commit 86822f816f
14 changed files with 34 additions and 85 deletions

View file

@ -40,7 +40,6 @@
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/hardware/clps7111.h>
#define UART_NR 2