diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:52:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 17:52:18 +0100 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /drivers/usb/storage/initializers.h | |
| parent | V4L/DVB (3415): Msp3400-kthreads.c: make 3 functions static (diff) | |
| parent | Linux 2.6.16 (diff) | |
| download | linux-b05005772f34497eb2b7415a651fe785cbe70e16.tar.xz linux-b05005772f34497eb2b7415a651fe785cbe70e16.zip | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'drivers/usb/storage/initializers.h')
| -rw-r--r-- | drivers/usb/storage/initializers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h index 4c1b2bd2e2e4..f9907a5cf129 100644 --- a/drivers/usb/storage/initializers.h +++ b/drivers/usb/storage/initializers.h @@ -48,3 +48,4 @@ int usb_stor_euscsi_init(struct us_data *us); /* This function is required to activate all four slots on the UCR-61S2B * flash reader */ int usb_stor_ucr61s2b_init(struct us_data *us); +int rio_karma_init(struct us_data *us); |