diff options
author | Dave Airlie <airlied@redhat.com> | 2014-10-07 06:31:14 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-10-07 06:31:14 +0200 |
commit | 46d987af7649ef9b2f1d1467b9249fb6e24d2658 (patch) | |
tree | d46ecf4acfb9a84622acaf227d5707d54b34e7fd /drivers/gpu/ipu-v3/ipu-smfc.c | |
parent | Merge tag 'topic/core-stuff-2014-10-03' of git://anongit.freedesktop.org/drm-... (diff) | |
parent | gpu: ipu-v3: Kconfig: Remove SOC_IMX6SL from IMX_IPUV3_CORE Kconfig (diff) | |
download | linux-46d987af7649ef9b2f1d1467b9249fb6e24d2658.tar.xz linux-46d987af7649ef9b2f1d1467b9249fb6e24d2658.zip |
Merge tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next
IPUv3 fixes for v3.18
* tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux:
gpu: ipu-v3: Kconfig: Remove SOC_IMX6SL from IMX_IPUV3_CORE Kconfig
gpu: ipu-v3: ipu-smfc: Do not leave DEBUG defined
gpu: ipu-v3: Return proper error on ipu_add_client_devices error path
gpu: ipu-v3: Select GENERIC_IRQ_CHIP to fix build error
Diffstat (limited to 'drivers/gpu/ipu-v3/ipu-smfc.c')
-rw-r--r-- | drivers/gpu/ipu-v3/ipu-smfc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-smfc.c b/drivers/gpu/ipu-v3/ipu-smfc.c index 6ca9b43ce25a..4ef910991413 100644 --- a/drivers/gpu/ipu-v3/ipu-smfc.c +++ b/drivers/gpu/ipu-v3/ipu-smfc.c @@ -8,7 +8,6 @@ * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html */ -#define DEBUG #include <linux/export.h> #include <linux/types.h> #include <linux/init.h> |