diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:44 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:44 -0500 |
| commit | de1bb03af7f4dde8e0e823629909d179fed4beff (patch) | |
| tree | 4ea86f8e160b8ea5c9689883c7f7da1536f5294b /arch/powerpc/kernel/rtas.c | |
| parent | 11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 (diff) | |
| parent | f459d63e1689b16a2f5a965557e19b25bad5dbdc (diff) | |
Merge branch 'dt' into next
Diffstat (limited to 'arch/powerpc/kernel/rtas.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index fcec38241f79..1fd6e7b2f390 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <asm/time.h> | 42 | #include <asm/time.h> |
| 43 | #include <asm/mmu.h> | 43 | #include <asm/mmu.h> |
| 44 | #include <asm/topology.h> | 44 | #include <asm/topology.h> |
| 45 | #include <asm/pSeries_reconfig.h> | ||
| 46 | 45 | ||
| 47 | struct rtas_t rtas = { | 46 | struct rtas_t rtas = { |
| 48 | .lock = __ARCH_SPIN_LOCK_UNLOCKED | 47 | .lock = __ARCH_SPIN_LOCK_UNLOCKED |