sugar/linux
1
0
Fork 0
Code Activity
Files
bbea6de1bd12dd509f774f2a3165216eeac7bc54
linux/drivers
History
Andrzej Pietrasiewicz bbea6de1bd usb: gadget: f_uvc: rename a macro to avoid conflicts 
When configfs is integrated, CONFIGFS_ATTR_STRUCT and CONFIGFS_ATTR_OPS
macros should be used, but the latter expects that tere is a to_f_uvc_opts
function accepting a config_item, whereas the macro being changed
can be applied to a different type of argument.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-01-12 12:13:26 -06:00
..
accessibility
…
acpi
Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video'
2015-01-06 23:35:43 +01:00
amba
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
android
…
ata
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
atm
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
auxdisplay
…
base
Merge branches 'pm-domains', 'powercap' and 'pm-tools'
2014-12-29 21:24:00 +01:00
bcma
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-12-11 17:56:37 -08:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-12-17 16:03:12 -08:00
bluetooth
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2014-12-15 13:23:09 -05:00
bus
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
cdrom
…
char
ipmi: Fix compile warning with tv_usec
2014-12-30 13:34:36 -06:00
clk
Merge tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux
2014-12-20 16:42:36 -08:00
clocksource
Merge tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu into fixes
2014-12-30 15:27:20 +01:00
connector
…
coresight
…
cpufreq
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
2014-12-29 21:23:41 +01:00
cpuidle
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
2014-12-29 21:23:41 +01:00
crypto
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
dca
…
devfreq
…
dio
…
dma
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
dma-buf
…
edac
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
eisa
…
extcon
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
firewire
firewire: sbp2: replace card lock by target lock
2014-12-10 20:53:21 +01:00
firmware
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
fmc
…
gpio
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
gpu
Merge tag 'amdkfd-fixes-2015-01-06' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes
2015-01-08 10:36:37 +10:00
hid
HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
2015-01-09 14:41:01 +01:00
hsi
Merge tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
2014-12-15 17:33:47 -08:00
hv
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
hwmon
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-12-17 10:16:27 -08:00
hwspinlock
…
i2c
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-12-20 13:52:52 -08:00
ide
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
idle
…
iio
Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2014-12-15 18:06:13 -08:00
infiniband
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2014-12-20 13:42:57 -08:00
input
Revert "Input: atmel_mxt_ts - use deep sleep mode when stopped"
2014-12-31 12:59:34 -08:00
iommu
iommu/rockchip: Drop owner assignment from platform_drivers
2015-01-05 12:40:06 +01:00
ipack
…
irqchip
Merge branch 'irq-irqdomain-arm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-15 17:30:09 -08:00
isdn
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-12-12 10:08:06 -08:00
leds
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
lguest
virtio: allow finalize_features to fail
2014-12-09 16:32:32 +02:00
macintosh
macintosh: therm_pm72: delete deprecated driver
2014-12-19 19:32:47 +01:00
mailbox
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
mcb
…
md
dm: fix missed error code if .end_io isn't implemented by target_type
2014-12-17 12:31:13 -05:00
media
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
memory
Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd
2014-12-17 09:59:26 -08:00
memstick
…
message
…
mfd
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-12-30 16:59:59 -08:00
misc
Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
2014-12-19 12:57:45 -08:00
mmc
mmc: core: stop trying to switch width when only one bit is supported
2014-12-29 14:49:28 +01:00
mtd
Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd
2014-12-17 09:59:26 -08:00
net
qla3xxx: don't allow never end busy loop
2015-01-06 17:41:36 -05:00
nfc
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
ntb
…
nubus
…
of
Merge tag 'iommu-config-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-12-16 14:53:01 -08:00
oprofile
…
parisc
…
parport
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
pci
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-19 14:02:02 -08:00
pcmcia
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
phy
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
pinctrl
pinctrl: st: Add irq_disable hook to st_gpio_irqchip
2015-01-07 10:44:39 +01:00
platform
Merge tag 'platform-drivers-x86-v3.19-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2014-12-18 20:24:55 -08:00
pnp
…
power
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
powercap
powercap / RAPL: add IDs for future Xeon CPUs
2014-12-17 02:35:42 +01:00
pps
…
ps3
…
ptp
…
pwm
Merge tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2014-12-17 10:10:51 -08:00
rapidio
…
ras
…
regulator
Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
2014-12-29 13:24:38 -08:00
remoteproc
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
reset
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
rpmsg
…
rtc
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
s390
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
sbus
…
scsi
qla2xxx: fix busy wait regression
2015-01-05 18:15:08 +01:00
sfi
…
sh
drivers: sh / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-05 03:08:24 +01:00
sn
…
soc
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-12-15 15:52:01 -08:00
spi
Merge remote-tracking branches 'spi/fix/img-spfi' and 'spi/fix/msiof' into spi-linus
2014-12-24 12:57:54 +00:00
spmi
…
ssb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-12-11 17:56:37 -08:00
staging
[regression] braino in "lustre: use is_root_inode()"
2014-12-26 22:43:19 -05:00
target
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2014-12-20 13:42:57 -08:00
tc
…
thermal
Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next
2014-12-24 10:38:30 +08:00
thunderbolt
…
tty
tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-19 15:27:58 +01:00
uio
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
usb
usb: gadget: f_uvc: rename a macro to avoid conflicts
2015-01-12 12:13:26 -06:00
uwb
…
vfio
vfio-pci: Fix the check on pci device type in vfio_pci_probe()
2015-01-07 10:29:11 -07:00
vhost
vhost/net: length miscalculation
2015-01-07 12:22:00 +02:00
video
OMAPDSS: SDI: fix output port_num
2014-12-30 11:18:30 +02:00
virt
…
virtio
virtio_pci: document why we defer kfree
2015-01-06 16:35:36 +02:00
vlynq
…
vme
…
w1
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
watchdog
watchdog: imx2_wdt: Fix the argument of watchdog_active()
2014-12-18 16:01:20 +01:00
xen
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
2014-12-18 05:56:29 -08:00
zorro
…
Kconfig
Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2014-12-15 18:06:13 -08:00
Makefile
drivers: Move iommu/ before gpu/ in Makefile
2014-12-22 11:47:37 +02:00