Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / media / si4713.h

diff --git a/include/media/si4713.h b/include/media/si4713.h
index 99850a54ed096edfa03233d7c6c3376c6bbeabc0..ed7353e8a982364da16d64801a4463980e5b6d15 100644 (file)
--- a/include/media/si4713.h
+++ b/include/media/si4713.h
@@ -23,8 +23,7 @@
  * Platform dependent definition
  */
 struct si4713_platform_data {
-       /* Set power state, zero is off, non-zero is on. */
-       int (*set_power)(int power);
+       int gpio_reset; /* < 0 if not used */
 };
 
 /*