git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
media
/
video
/
pwc
/
pwc-nala.h
diff --git
a/drivers/usb/media/pwc/pwc-nala.h
b/drivers/media/video/pwc/pwc-nala.h
similarity index 99%
rename from
drivers/usb/media/pwc/pwc-nala.h
rename to
drivers/media/video/pwc/pwc-nala.h
index
e6c5cb6
..
168c73e
100644
(file)
--- a/
drivers/usb/media/pwc/pwc-nala.h
+++ b/
drivers/media/video/pwc/pwc-nala.h
@@
-54,7
+54,7
@@
{0},
},
/* VGA */
{0},
},
/* VGA */
- {
+ {
{0},
{0},
{0},
{0},
{0},
{0},