Ian Abbott 0ea6fa037e staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants ... A merge conflict between commits fbfd9c8a17 ("staging: comedi: addi_apci_3120: use dma_alloc_coherent()") and aff5b1f8eb ("staging: comedi: remove comedi_fc module") left the COMEDI_ADDI_APCI_3120 config option depending on VIRT_TO_BUS when it no longer needs to do so. The dependency was removed by the first commit and accidentally reinstated by the second commit. Remove the dependency again. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-10-29 16:18:31 +08:00
..
android	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
bcm	Staging: bcm: Removed unnecessary else.	2014-10-02 09:33:46 -07:00
board
comedi	staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants	2014-10-29 16:18:31 +08:00
cptm1217
dgap	staging: dgap: use dgap_release_remap() in dgap_cleanup_board()	2014-09-23 23:39:25 -07:00
dgnc	TTY/Serial driver patches for 3.18-rc1	2014-10-08 06:52:11 -04:00
emxx_udc	staging: emxx_udc: Use min_t instead of min	2014-10-02 13:51:03 -07:00
ft1000	staging: ft1000: ft1000-usb: Removed unnecessary else statement.	2014-10-02 10:13:37 -07:00
fwserial
gdm72xx	drivers: staging: gdm72xx: Removed unnecessary braces.	2014-09-28 23:27:35 -04:00
gdm724x	staging: gdm724x: Removed unnecessary else expression.	2014-09-28 23:27:34 -04:00
goldfish
gs_fpgaboot	staging: gs_fpgaboot Fix trailing whitespace.	2014-09-19 17:42:15 -07:00
iio	First round of IIO fixes for the 3.18 cycle.	2014-10-25 10:09:39 +08:00
imx-drm	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-10-14 09:39:08 +02:00
line6	staging: line6: fix midibuf.c coding style issue	2014-09-23 23:41:25 -07:00
lustre	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
media	media updates for v3.18-rc1	2014-10-10 22:04:49 -04:00
mt29f_spinand
netlogic
nvec
octeon	staging: octeon: Combined seperate strings.	2014-10-02 09:59:20 -07:00
octeon-usb
olpc_dcon
ozwpan	staging: ozwpan: Remove typedefs	2014-09-28 22:03:58 -04:00
panel
rtl8188eu	staging: r8188eu: replace strnicmp with strncasecmp	2014-10-14 02:18:25 +02:00
rtl8192e	staging: rtl8192e: use %*pEn to escape buffer	2014-10-14 02:18:27 +02:00
rtl8192u	staging: rtl8192u: use %*pEn to escape buffer	2014-10-14 02:18:27 +02:00
rtl8712	staging: rtl8712: Fixed else not required after return	2014-10-02 11:59:40 -07:00
rtl8723au	staging: rtl8723au: Fix alignment of mac_addr for ether_addr_copy() usage	2014-10-20 12:51:10 +08:00
rts5208	staging: rts5208: remove unnecessary else	2014-10-02 10:07:04 -07:00
skein	staging: skein: replace spaces with tabs	2014-09-19 17:27:28 -07:00
slicoss	staging: slicoss: Fix void function return statements style warning	2014-09-28 23:36:24 -04:00
speakup	staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>	2014-10-02 10:09:01 -07:00
ste_rmi4	Staging: ste_rmi4: add new line after declarations	2014-09-23 13:44:11 -07:00
unisys	staging: unisys: Fix CamelCase in uislib_force_channel_interrupt()	2014-10-02 09:49:29 -07:00
vme	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
vt6655	staging: vt6655: Fixed C99 // comment errors in wpactl.c	2014-10-02 10:11:26 -07:00
vt6656	staging: vt6656: Merge three lines into one	2014-09-28 23:22:21 -04:00
wlan-ng	staging: wlan-ng: use %*pEhp to print SN	2014-10-14 02:18:27 +02:00
xgifb
Kconfig	staging: et131x: Remove et131x driver from drivers/staging	2014-10-03 13:55:14 -07:00
Makefile	staging: et131x: Remove et131x driver from drivers/staging	2014-10-03 13:55:14 -07:00
staging.c