diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/char/hw_random/omap-rng.c | |
parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
download | talos-op-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.gz talos-op-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/char/hw_random/omap-rng.c')
-rw-r--r-- | drivers/char/hw_random/omap-rng.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index a5effd813abd..45e467dcc8c8 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c @@ -27,8 +27,6 @@ #include <asm/io.h> -#include <plat/cpu.h> - #define RNG_OUT_REG 0x00 /* Output register */ #define RNG_STAT_REG 0x04 /* Status register [0] = STAT_BUSY */ |