aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:17:16 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:17:16 +0900
commitd4d2ad948e9a9c316e72fdc09d7490dfda4773da (patch)
tree38c50fa58d76fa90004a3bab593a6fa353dc1a33 /include
parent5c3b9bac28c62151f133a944fe14df5e153ae493 (diff)
parent540565257101f7c52b6fc5a57651f7505f8d20fe (diff)
downloadmrst-s0i3-test-d4d2ad948e9a9c316e72fdc09d7490dfda4773da.tar.gz
mrst-s0i3-test-d4d2ad948e9a9c316e72fdc09d7490dfda4773da.tar.xz
mrst-s0i3-test-d4d2ad948e9a9c316e72fdc09d7490dfda4773da.zip
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling. ARM: mach-shmobile: clock-sh7372: remove unnecessary fsi clocks ARM: mach-shmobile: clock-sh7372: modify error code ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642 ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix
Diffstat (limited to 'include')
-rw-r--r--include/sound/sh_fsi.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index fa60cbda90a..d79894192ae 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -85,7 +85,9 @@
* ACK_MD (FSI2)
* CKG1 (FSI)
*
- * err: return value < 0
+ * err : return value < 0
+ * no change : return value == 0
+ * change xMD : return value > 0
*
* 0x-00000AB
*
@@ -111,7 +113,7 @@
struct sh_fsi_platform_info {
unsigned long porta_flags;
unsigned long portb_flags;
- int (*set_rate)(int is_porta, int rate); /* for master mode */
+ int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
};
#endif /* __SOUND_FSI_H */