projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[powerpc.git]
/
include
/
linux
/
videodev.h
diff --git
a/include/linux/videodev.h
b/include/linux/videodev.h
index
41bc7e9
..
8dba97a
100644
(file)
--- a/
include/linux/videodev.h
+++ b/
include/linux/videodev.h
@@
-12,10
+12,10
@@
#ifndef __LINUX_VIDEODEV_H
#define __LINUX_VIDEODEV_H
#ifndef __LINUX_VIDEODEV_H
#define __LINUX_VIDEODEV_H
-#define HAVE_V4L1 1
-
#include <linux/videodev2.h>
#include <linux/videodev2.h>
+#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
+
struct video_capability
{
char name[32];
struct video_capability
{
char name[32];
@@
-336,6
+336,8
@@
struct video_code
#define VID_HARDWARE_SN9C102 38
#define VID_HARDWARE_ARV 39
#define VID_HARDWARE_SN9C102 38
#define VID_HARDWARE_ARV 39
+#endif /* CONFIG_VIDEO_V4L1_COMPAT */
+
#endif /* __LINUX_VIDEODEV_H */
/*
#endif /* __LINUX_VIDEODEV_H */
/*