aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-14 21:55:27 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-14 21:55:27 -0400
commit5b0504c0d795d6b0a904ff861c043d7a231f67a4 (patch)
treec988e8b614c55d0dae2be4b750a03eb0a4f4d355 /drivers/ata
parent930074b6b9c4895d20cdadba5aff97907e28728d (diff)
parent77a76369475801ab8cbb338b9d8cfa92a491badb (diff)
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_mpc52xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index bc79df6e7cb0..a9e827356d06 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -16,10 +16,10 @@
16#include <linux/slab.h> 16#include <linux/slab.h>
17#include <linux/delay.h> 17#include <linux/delay.h>
18#include <linux/libata.h> 18#include <linux/libata.h>
19#include <linux/of_platform.h>
19 20
20#include <asm/types.h> 21#include <asm/types.h>
21#include <asm/prom.h> 22#include <asm/prom.h>
22#include <asm/of_platform.h>
23#include <asm/mpc52xx.h> 23#include <asm/mpc52xx.h>
24 24
25 25