X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fvideo_output.h;h=2fb46bc9340d9b40617042ba8bb253754e4b6f67;hb=03c127ee1e0c5f7a5285d1af3d5c1571ac2646a1;hp=e63e0c03ee0d2be327022ad17fcefe8127ea12e7;hpb=b22364c8eec89e6b0c081a237f3b6348df87796f;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/video_output.h b/include/linux/video_output.h
index e63e0c03ee0..2fb46bc9340 100644
--- a/include/linux/video_output.h
+++ b/include/linux/video_output.h
@@ -31,9 +31,9 @@ struct output_properties {
 struct output_device {
 	int request_state;
 	struct output_properties *props;
-	struct class_device class_dev;
+	struct device dev;
 };
-#define to_output_device(obj) container_of(obj, struct output_device, class_dev)
+#define to_output_device(obj) container_of(obj, struct output_device, dev)
 struct output_device *video_output_register(const char *name,
 	struct device *dev,
 	void *devdata,