linux-um.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: linux-kernel@vger.kernel.org
Cc: user-mode-linux-devel@lists.sourceforge.net,
	Richard Weinberger <richard@nod.at>,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
	Olli Salonen <olli.salonen@iki.fi>,
	linux-media@vger.kernel.org
Subject: [PATCH 17/22] media: Fix dependencies for !HAS_IOMEM archs
Date: Mon, 25 Jan 2016 23:24:16 +0100	[thread overview]
Message-ID: <1453760661-1444-18-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1453760661-1444-1-git-send-email-richard@nod.at>

Not every arch has io memory.
While the driver has correct dependencies the select statement
will bypass the HAS_IOMEM dependency.
So, unbreak the build by rendering it into a real dependency.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 drivers/media/Kconfig             | 3 +--
 drivers/media/usb/cx231xx/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index a8518fb..5553cb1 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -187,8 +187,7 @@ config MEDIA_SUBDRV_AUTOSELECT
 	bool "Autoselect ancillary drivers (tuners, sensors, i2c, frontends)"
 	depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT || MEDIA_SDR_SUPPORT
 	depends on HAS_IOMEM
-	select I2C
-	select I2C_MUX
+	depends on I2C_MUX && I2C
 	default y
 	help
 	  By default, a media driver auto-selects all possible ancillary
diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig
index 0cced3e..30ae67d 100644
--- a/drivers/media/usb/cx231xx/Kconfig
+++ b/drivers/media/usb/cx231xx/Kconfig
@@ -1,13 +1,13 @@
 config VIDEO_CX231XX
 	tristate "Conexant cx231xx USB video capture support"
 	depends on VIDEO_DEV && I2C
+	depends on I2C_MUX
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
 	depends on RC_CORE
 	select VIDEOBUF_VMALLOC
 	select VIDEO_CX25840
 	select VIDEO_CX2341X
-	select I2C_MUX
 
 	---help---
 	  This is a video4linux driver for Conexant 231xx USB based TV cards.
-- 
1.8.4.5



  parent reply	other threads:[~2016-01-25 22:24 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-25 22:23 [uml-devel] (no subject) Richard Weinberger
2016-01-25 22:24 ` [PATCH 01/22] power: reset: Fix dependencies for !HAS_IOMEM archs Richard Weinberger
2016-01-26 23:34   ` Florian Fainelli
2016-01-27  8:02     ` Richard Weinberger
2016-02-15  5:57   ` Sebastian Reichel
2016-01-25 22:24 ` [PATCH 02/22] phy: " Richard Weinberger
2016-02-03  6:21   ` Kishon Vijay Abraham I
2016-01-25 22:24 ` [uml-devel] [PATCH 03/22] scsi: Fix dependencies for !HAS_IOMEM and !HAS_DMA archs Richard Weinberger
2016-01-26 10:15   ` John Garry
2016-01-26 10:31     ` Richard Weinberger
2016-01-26 10:54       ` John Garry
2016-01-27  2:16         ` Martin K. Petersen
2016-01-25 22:24 ` [PATCH 04/22] staging: iio: Fix dependencies for !HAS_IOMEM archs Richard Weinberger
2016-01-26 10:59   ` Geert Uytterhoeven
2016-01-30 15:47     ` Jonathan Cameron
2016-01-25 22:24 ` [PATCH 05/22] hw_random: " Richard Weinberger
2016-01-26  9:58   ` Daniel Thompson
2016-01-26 14:49   ` Herbert Xu
2016-01-25 22:24 ` [PATCH 06/22] iio: adc: " Richard Weinberger
2016-01-30 15:44   ` Jonathan Cameron
2016-01-25 22:24 ` [uml-devel] [PATCH 07/22] fpga: " Richard Weinberger
2016-01-25 23:33   ` Moritz Fischer
2016-01-25 22:24 ` [uml-devel] [PATCH 08/22] hwtracing: " Richard Weinberger
2016-02-05 14:07   ` Alexander Shishkin
2016-01-25 22:24 ` [uml-devel] [PATCH 09/22] leds: " Richard Weinberger
2016-01-25 22:42   ` Richard Weinberger
2016-01-25 22:24 ` [uml-devel] [PATCH 10/22] mailbox: " Richard Weinberger
2016-01-25 22:24 ` [PATCH 11/22] mtd: " Richard Weinberger
2016-01-26 11:00   ` Geert Uytterhoeven
2016-01-26 19:31     ` Brian Norris
2016-01-25 22:24 ` [uml-devel] [PATCH 12/22] nvmem: " Richard Weinberger
2016-01-26 11:19   ` Srinivas Kandagatla
2016-01-26 14:20     ` Richard Weinberger
2016-01-25 22:24 ` [PATCH 13/22] net: " Richard Weinberger
2016-01-26 23:15   ` Noam Camus
2016-01-29  0:03   ` David Miller
2016-01-25 22:24 ` [PATCH 14/22] pwm: " Richard Weinberger
2016-01-25 22:40   ` Richard Weinberger
2016-01-25 22:24 ` [PATCH 15/22] watchdog: " Richard Weinberger
2016-01-26  2:47   ` Guenter Roeck
2016-01-25 22:24 ` [PATCH 16/22] iio: imu: " Richard Weinberger
2016-01-26  0:15   ` Paul Bolle
2016-01-26  8:17     ` Richard Weinberger
2016-01-30 15:49       ` Jonathan Cameron
2016-01-25 22:24 ` Richard Weinberger [this message]
2016-02-01 13:26   ` [PATCH 17/22] media: " Mauro Carvalho Chehab
2016-01-25 22:24 ` [PATCH 18/22] irqchip: " Richard Weinberger
2016-01-25 22:24 ` [PATCH 19/22] thermal: " Richard Weinberger
2016-01-25 22:24 ` [PATCH 20/22] clocksource: " Richard Weinberger
2016-01-25 22:24 ` [PATCH 21/22] mtd: cs553x: " Richard Weinberger
2016-01-26 11:00   ` Geert Uytterhoeven
2016-01-26 13:58     ` Richard Weinberger
2016-02-01 17:38       ` Brian Norris
2016-01-25 22:24 ` [uml-devel] [PATCH 22/22] um: Export pm_power_off Richard Weinberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453760661-1444-18-git-send-email-richard@nod.at \
    --to=richard@nod.at \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@osg.samsung.com \
    --cc=olli.salonen@iki.fi \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).