summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/include/mach/devices-common.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 04:11:43 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 04:11:43 (GMT)
commitb1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch)
tree17d15f3a6dc5bdd6205070dbef0e339421b13d25 /arch/arm/mach-mxs/include/mach/devices-common.h
parent9d14070f656addddce3d63fd483de46930b51850 (diff)
parentc1537b4863da620f12f5b42ece61bf65314148ed (diff)
downloadlinux-fsl-qoriq-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.xz
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'arch/arm/mach-mxs/include/mach/devices-common.h')
-rw-r--r--arch/arm/mach-mxs/include/mach/devices-common.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index a8080f4..dc369c1 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -94,6 +94,7 @@ struct platform_device *__init mxs_add_mxs_pwm(
resource_size_t iobase, int id);
/* saif */
+#include <sound/saif.h>
struct mxs_saif_data {
int id;
resource_size_t iobase;
@@ -103,4 +104,5 @@ struct mxs_saif_data {
};
struct platform_device *__init mxs_add_saif(
- const struct mxs_saif_data *data);
+ const struct mxs_saif_data *data,
+ const struct mxs_saif_platform_data *pdata);