mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
aed6abd662c2903733bea7fcd3856c306e650680
linux/drivers
History
Mauro Carvalho Chehab aed6abd662 V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver 
LD      drivers/media/video/built-in.o
drivers/media/video/cx18/built-in.o: In function `get_service_set':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:118: multiple definition of `get_service_set'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:119: first defined here
drivers/media/video/cx18/built-in.o: In function `expand_service_set':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:92: multiple definition of `expand_service_set'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:92: first defined here
drivers/media/video/cx18/built-in.o: In function `service2vbi':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:44: multiple definition of `service2vbi'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:42: first defined here
make[2]: ** [drivers/media/video/built-in.o] Erro 1
make[1]: ** [drivers/media/video] Erro 2
make: ** [drivers/media/] Erro 2

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-29 18:41:42 -03:00
..
acorn/char
…
acpi
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
2008-04-29 08:26:51 -07:00
amba
…
ata
Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2)
2008-04-29 02:17:18 -04:00
atm
drivers: atm, char fix integer as NULL pointer warnings
2008-04-28 17:29:18 -07:00
auxdisplay
…
base
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
2008-04-29 08:26:51 -07:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-04-29 08:18:03 -07:00
bluetooth
hci_usb: remove code obfuscation
2008-04-19 18:17:26 -07:00
cdrom
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-04-29 08:18:03 -07:00
char
Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
2008-04-29 11:41:22 -07:00
clocksource
…
connector
…
cpufreq
[CPUFREQ] state info wrong after resume
2008-04-28 16:27:08 -04:00
cpuidle
…
crypto
[CRYPTO] padlock-aes: Use generic setkey function
2008-04-21 10:19:34 +08:00
dca
…
dio
…
dma
DMA engine: typo fixes
2008-04-21 22:38:45 +00:00
edac
edac: fix module initialization on several modules 2nd time
2008-04-29 08:06:26 -07:00
eisa
…
firewire
Convert asm/semaphore.h users to linux/semaphore.h
2008-04-18 22:22:54 -04:00
firmware
edd: add default mode CONFIG_EDD_OFF=n, override with edd={on,off}
2008-04-29 08:06:23 -07:00
gpio
gpiochip_reserve()
2008-04-28 08:58:34 -07:00
hid
hid-core: use get_unaligned_* helpers
2008-04-29 08:06:27 -07:00
hwmon
…
i2c
i2c: Fix platform driver hotplug/coldplug
2008-04-22 22:16:49 +02:00
ide
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-04-29 08:18:03 -07:00
ieee1394
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2008-04-25 12:24:06 -07:00
infiniband
IB: expand ib_umem_get() prototype
2008-04-29 08:06:12 -07:00
input
input: use get_unaligned_* helpers
2008-04-29 08:06:27 -07:00
isdn
isdn: use non-racy method for proc entries creation
2008-04-29 08:06:22 -07:00
leds
Remove duplicated unlikely() in IS_ERR()
2008-04-29 08:06:25 -07:00
lguest
drivers: Remove unnecessary inclusions of asm/semaphore.h
2008-04-18 22:16:32 -04:00
macintosh
[POWERPC] windfarm: Add PowerMac 12,1 support
2008-04-29 15:57:35 +10:00
mca
proc: remove proc_root from drivers
2008-04-29 08:06:18 -07:00
md
dm: use unlocked variants of queue flag check/set
2008-04-29 10:21:12 -07:00
media
V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
2008-04-29 18:41:42 -03:00
memstick
memstick: convert struct class_device to struct device
2008-04-19 19:10:29 -07:00
message
Remove duplicated unlikely() in IS_ERR()
2008-04-29 08:06:25 -07:00
mfd
mfd: use shorter set_current_state()
2008-04-28 08:58:32 -07:00
misc
drivers: use non-racy method for proc entries creation (2)
2008-04-29 08:06:22 -07:00
mmc
mmc: use get/put_unaligned_* helpers
2008-04-29 08:06:27 -07:00
mtd
drivers: fix integer as NULL pointer warnings
2008-04-28 17:31:13 -07:00
net
drivers/net/tehuti: use proper capability check for raw IO access
2008-04-29 11:45:16 -07:00
nubus
proc: convert /proc/bus/nubus to seq_file interface
2008-04-29 08:06:19 -07:00
of
[POWERPC] drivers/of/of_i2c.c: Add MODULE_LICENSE
2008-04-24 20:58:01 +10:00
oprofile
oprofile: change cpu_buffer from array to per_cpu variable
2008-04-28 08:58:31 -07:00
parisc
parisc: use non-racy method for proc entries creation
2008-04-29 08:06:22 -07:00
parport
parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
2008-04-29 08:06:26 -07:00
pci
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-04-29 10:17:59 -07:00
pcmcia
drivers/pcmcia/pcmcia_ioctl.c: fix build
2008-04-29 11:00:39 -07:00
pnp
drivers: use non-racy method for proc entries creation (2)
2008-04-29 08:06:22 -07:00
power
x86: olpc: add One Laptop Per Child architecture support
2008-04-29 08:06:07 -07:00
ps3
…
rapidio
[RAPIDIO] Auto-probe the RapidIO system size
2008-04-29 19:40:28 +10:00
rtc
Remove duplicated unlikely() in IS_ERR()
2008-04-29 08:06:25 -07:00
s390
s390: use non-racy method for proc entries creation
2008-04-29 08:06:21 -07:00
sbus
…
scsi
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-04-29 08:18:03 -07:00
serial
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
2008-04-28 10:51:43 -07:00
sh
…
sn
…
spi
spi: spi_imx updates
2008-04-28 08:58:31 -07:00
ssb
ssb: Fix all-ones boardflags
2008-04-23 21:25:35 -04:00
tc
…
telephony
…
thermal
…
uio
UIO: hold a reference to the device's owner while the device is open
2008-04-19 19:10:18 -07:00
usb
usb: use get/put_unaligned_* helpers
2008-04-29 08:06:28 -07:00
video
video: use get/put_unaligned_* helpers
2008-04-29 08:06:28 -07:00
virtio
…
w1
…
watchdog
Convert asm/semaphore.h users to linux/semaphore.h
2008-04-18 22:22:54 -04:00
xen
xen: add balloon driver
2008-04-24 23:57:33 +02:00
zorro
zorro: use non-racy method for proc entries creation
2008-04-29 08:06:21 -07:00
Kconfig
xen: add balloon driver
2008-04-24 23:57:33 +02:00
Makefile
…