summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
diff options
context:
space:
mode:
authorRoland Stigge2012-04-26 22:10:51 +0200
committerGreg Kroah-Hartman2012-04-30 03:14:40 +0200
commit5d4a6789d5957a6388ea86c811d7c09bbe5f8ebd (patch)
tree5af045fe0a413286b9f8001f3d5e4b238dbee356 /drivers/staging/iio/trigger/iio-trig-bfin-timer.c
parentStaging: VME: move VME drivers out of staging (diff)
downloadkernel-qcow2-linux-5d4a6789d5957a6388ea86c811d7c09bbe5f8ebd.tar.gz
kernel-qcow2-linux-5d4a6789d5957a6388ea86c811d7c09bbe5f8ebd.tar.xz
kernel-qcow2-linux-5d4a6789d5957a6388ea86c811d7c09bbe5f8ebd.zip
staging: iio: lpc32xx-adc: Remove driver conflict due to device tree
Previously, the touchscreen and ADC drivers of the LPC32xx SoC had a Kconfig conflict declared because they use the same hardware. Upon the introduction of device tree support in both drivers, the conflict must be removed to enable the same kernel to support different hardware (configured via the device tree). Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/trigger/iio-trig-bfin-timer.c')
0 files changed, 0 insertions, 0 deletions