diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /drivers/media/video/stv680.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'drivers/media/video/stv680.c')
| -rw-r--r-- | drivers/media/video/stv680.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 351b182d921f..2ba2991a214f 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | * Fixed proc entry removal bug. | 58 | * Fixed proc entry removal bug. |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/config.h> | ||
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/init.h> | 62 | #include <linux/init.h> |
| 64 | #include <linux/vmalloc.h> | 63 | #include <linux/vmalloc.h> |