diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/ata_platform.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/linux/ata_platform.h')
| -rw-r--r-- | include/linux/ata_platform.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/ata_platform.h b/include/linux/ata_platform.h index 9a26c83a2c9e..b856a2a590d9 100644 --- a/include/linux/ata_platform.h +++ b/include/linux/ata_platform.h | |||
| @@ -27,10 +27,7 @@ extern int __devexit __pata_platform_remove(struct device *dev); | |||
| 27 | /* | 27 | /* |
| 28 | * Marvell SATA private data | 28 | * Marvell SATA private data |
| 29 | */ | 29 | */ |
| 30 | struct mbus_dram_target_info; | ||
| 31 | |||
| 32 | struct mv_sata_platform_data { | 30 | struct mv_sata_platform_data { |
| 33 | struct mbus_dram_target_info *dram; | ||
| 34 | int n_ports; /* number of sata ports */ | 31 | int n_ports; /* number of sata ports */ |
| 35 | }; | 32 | }; |
| 36 | 33 | ||
