diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-13 03:57:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-13 03:57:10 -0400 |
| commit | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (patch) | |
| tree | a2c186cb828e3713c2ec48a4d7191166fb798b3d /drivers/firewire/ohci.c | |
| parent | 659c36fcda403013a01b85da07cf2d9711e6d6c7 (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge tag 'v3.4-rc2' into perf/core
Merge Linux 3.4-rc2: we were on v3.3, update the base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firewire/ohci.c')
| -rw-r--r-- | drivers/firewire/ohci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 187b3f2e797e..2b5460075a9f 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | 46 | ||
| 47 | #include <asm/byteorder.h> | 47 | #include <asm/byteorder.h> |
| 48 | #include <asm/page.h> | 48 | #include <asm/page.h> |
| 49 | #include <asm/system.h> | ||
| 50 | 49 | ||
| 51 | #ifdef CONFIG_PPC_PMAC | 50 | #ifdef CONFIG_PPC_PMAC |
| 52 | #include <asm/pmac_feature.h> | 51 | #include <asm/pmac_feature.h> |