H Hartley Sweeten
80b00a5842
staging: comedi: adv_pci1724: remove enum sync_output_trigger_contents ...
This enum is not used in the driver. Remove it.
For aesthetics, rename the register define and move the comment that
any value will trigger the sync output.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-26 15:36:41 -08:00
Merge branches 'acpi-scan' and 'acpi-ec'
2014-10-31 22:24:44 +01:00
android: binder: remove binder.h
2014-10-20 10:30:15 +08:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
atm: simplify lanai.c by using module_pci_driver
2014-10-17 11:55:32 -04:00
tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP
2014-11-07 11:07:35 -08:00
bcma: add another PCI ID of device with BCM43228
2014-10-23 14:02:06 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-11-03 15:04:26 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
ARM: SoC driver updates for 3.18
2014-10-08 17:37:16 -04:00
Return short read or 0 at end of a raw device, not EIO
2014-10-31 06:33:26 -04:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
ARM/ARM64: arch-timer: fix arch_timer_probed logic
2014-10-26 20:50:00 +01:00
cpufreq: cpufreq-dt: Restore default cpumask_setall(policy->cpus)
2014-10-27 23:27:35 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-10-24 12:48:47 -07:00
crypto: LLVMLinux: Remove VLAIS from crypto/.../qat_algs.c
2014-10-14 10:51:23 +02:00
dma: edma: move device registration to platform code
2014-11-05 18:26:10 -08:00
dma-buf: don't open-code atomic_long_read()
2014-10-09 02:39:07 -04:00
e7xxx_edac: Report CE events properly
2014-10-22 22:59:00 +02:00
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-23 14:45:09 -07:00
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
drm/exynos: correct connector->dpms field before resuming
2014-11-03 01:51:28 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-10-29 11:52:35 -07:00
hwmon: (menf21bmc) Include linux/err.h
2014-10-19 18:41:18 -07:00
i2c: core: Dispose OF IRQ mapping at client removal time
2014-11-07 19:03:18 +01:00
Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block
2014-10-18 12:12:45 -07:00
Merge 3.18-rc4 into staging-next
2014-11-10 12:24:26 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-10-31 15:04:58 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-10-31 19:51:11 -07:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
irqchip: armada-370-xp: Fix MPIC interrupt handling
2014-11-02 01:31:10 +00:00
isdn/gigaset: fix usb_gigaset write_cmd result race
2014-10-14 15:05:35 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-10-21 08:18:38 -07:00
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2014-10-21 11:21:19 -07:00
. fix DM's long-standing excessive use of memory by leveraging the new
2014-10-18 12:25:30 -07:00
[media] sp2: sp2_init() can be static
2014-11-03 19:08:06 -02:00
memstick: r592: fix build warnings for !PM_SLEEP
2014-10-14 02:18:22 +02:00
Changes to existing drivers:
2014-10-15 06:58:16 +02:00
cxl: Fix PSL error due to duplicate segment table entries
2014-10-28 19:52:52 +11:00
mmc: core: fix card detection regression
2014-11-05 09:28:48 +01:00
Three main MTD fixes for 3.18:
2014-11-02 14:45:52 -08:00
Merge tag 'master-2014-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-10-31 16:18:35 -04:00
ntb: Adding split BAR support for Haswell platforms
2014-10-17 07:08:51 -04:00
of: Fix overflow bug in string property parsing functions
2014-11-04 10:19:48 +00:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
PCI updates for v3.18:
2014-10-31 18:48:29 -07:00
phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
2014-11-05 14:34:06 -08:00
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
2014-10-28 11:16:26 +01:00
quirk for Lenovo Yoga 3: no rfkill switch
2014-10-27 21:45:13 -07:00
PNP: replace strnicmp with strncasecmp
2014-10-14 02:18:25 +02:00
power: reset: at91-reset: fix power down register
2014-10-22 10:08:22 +02:00
pwm: Changes for v3.18-rc1
2014-10-21 08:17:43 -07:00
Merge remote-tracking branches 'regulator/fix/max1586', 'regulator/fix/max77686', 'regulator/fix/max77693', 'regulator/fix/max77802', 'regulator/fix/max8860' and 'regulator/fix/s2mpa01' into regulator-linus
2014-11-05 14:59:25 +00:00
drivers/rtc/rtc-bq32k.c: fix register value
2014-10-29 16:33:14 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-10-21 07:47:54 -07:00
libcxgbi : support ipv6 address host_param
2014-10-28 09:57:00 +01:00
soc: versatile: Add terminating entry for realview_soc_of_match
2014-10-28 22:05:07 +01:00
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus
2014-11-06 12:58:46 +00:00
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
staging: comedi: adv_pci1724: remove enum sync_output_trigger_contents
2014-11-26 15:36:41 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-10-21 13:06:38 -07:00
Thermal:Remove usless if(!result) before return tz
2014-11-03 18:59:50 -04:00
tty: Fix pty master poll() after slave closes v2
2014-11-06 12:23:36 -08:00
USB: cdc-acm: add quirk for control-line state requests
2014-11-06 12:25:40 -08:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
2014-10-30 14:53:49 +02:00
One cc: stable commit, the rest are a series of minor cleanups which have
2014-10-18 10:25:09 -07:00
watchdog: meson: remove magic value for reboot
2014-10-20 21:09:17 +02:00
xen/pci: Allocate memory for physdev_pci_device_add's optarr
2014-10-23 16:24:02 +01:00
staging: android: binder: move to the "real" part of the kernel
2014-10-20 10:30:15 +08:00
staging: android: binder: move to the "real" part of the kernel
2014-10-20 10:30:15 +08:00
80b00a5842