From patchwork Sat Mar 15 09:35:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3836651 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B313D9F1CD for ; Sat, 15 Mar 2014 09:36:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D10F720340 for ; Sat, 15 Mar 2014 09:36:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2D7320295 for ; Sat, 15 Mar 2014 09:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755203AbaCOJf4 (ORCPT ); Sat, 15 Mar 2014 05:35:56 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:49297 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752783AbaCOJfz (ORCPT ); Sat, 15 Mar 2014 05:35:55 -0400 Received: from klappe2.localnet (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue103) with ESMTP (Nemesis) id 0M2GKi-1XEefT1ijs-00s4yP; Sat, 15 Mar 2014 10:35:43 +0100 From: Arnd Bergmann To: linux-media@vger.kernel.org Subject: [PATCH] [media] Sensoray 2255 uses videobuf2 Date: Sat, 15 Mar 2014 10:35:39 +0100 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) Cc: Mauro Carvalho Chehab , "sensoray-dev" , Dean Anderson , Hans Verkuil MIME-Version: 1.0 Message-Id: <201403151035.39910.arnd@arndb.de> X-Provags-ID: V02:K0:bJpVViFDZNRTQoQhUKEyf8PPuIKBOJLc+rh1wHNiuRa FHDXkNHc0oBhftfKjjrljZOcKV2VsZ613j/LNgvDZl1PBuBlxr i+O3z8OFBsYDi8kYIqFGeqhGb3Ao1m7scrgLVhNwZgcqeLBboa rs7PpX/ED6u/7/J7x7liDLPC03ZOYqXtLQmL3yFWUS06czrZh2 W291meQzREzwlk5IpKQINz2oArUsF4wawlKFqFqtBYO0fB2kqt 7xHRgxu0E4Ho2o3eqhIa4qLTkbeIZ65wFfiz8bov7vFMNFUKc5 wjfmUkNiISemoWfgc22jPmGj4zUUJcaRlSkPzzmUhSbxdubdhT JwE5QSI+cLnL+sdEeEX7z6rt6L1AK7T2xoJFZ5jaH Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 340a30c514 "s2255drv: upgrade to videobuf2" changed the API used by the s2255 driver, but did not modify the Kconfig statement, which can lead to build errors when no other driver already uses VIDEOBUF2_VMALLOC. This patch does the necessary Kconfig change. Signed-off-by: Arnd Bergmann --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/usb/s2255/Kconfig b/drivers/media/usb/s2255/Kconfig index 7e8ee1f..8c3fcee 100644 --- a/drivers/media/usb/s2255/Kconfig +++ b/drivers/media/usb/s2255/Kconfig @@ -1,7 +1,7 @@ config USB_S2255 tristate "USB Sensoray 2255 video capture device" depends on VIDEO_V4L2 - select VIDEOBUF_VMALLOC + select VIDEOBUF2_VMALLOC default n help Say Y here if you want support for the Sensoray 2255 USB device.