From: Roland Stigge <stigge@antcom.de>
Date: Thu, 26 Apr 2012 20:10:51 +0000 (+0200)
Subject: staging: iio: lpc32xx-adc: Remove driver conflict due to device tree
X-Git-Tag: v3.5-rc1~145^2~229^2~56
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d4a6789d5957a6388ea86c811d7c09bbe5f8ebd;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed