linux-next: Tree for July 28 (lirc #2)
in [Kernel]
|
Prev: hw-breakpoints, kgdb, x86: add a flagtopassDIE_DEBUG notification
Next: [PATCH 2/2] video: msm: Fix section mismatch in mddi.c.
From: Janne Grunau on 29 Jul 2010 08:40 On Thu, Jul 29, 2010 at 12:27:01AM -0400, Jarod Wilson wrote: > On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod(a)wilsonet.com> wrote: > > On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap(a)oracle.com> wrote: > >> On 07/28/10 15:04, Janne Grunau wrote: > >>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: > >>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: > >>>> > >>>>> Hi all, > >>>>> > >>>>> Changes since 20100727: > >>>> > >>>> > >>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: > >>>> > >>> > >>> following patch should fix it > >>> > >>> Janne > >> > >> Acked-by: Randy Dunlap <randy.dunlap(a)oracle.com> > >> > >> Thanks. > > > > Acked-by: Jarod Wilson <jarod(a)redhat.com> > > > > Indeed, thanks much, Janne! > > D'oh, I should have looked a bit closer... What if instead of making > all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just > depends on LIRC? I started adding LIRC to each driver by one. Adding LIRC as LIRC_STAGING dependency is simpler. See updated patch. > And there are a few depends lines with duplicate > USB's in them and LIRC_IMON should have USB added to it (technically, D'oh, I've must have stopped reading after LIRC_STAG... fixed and added additional dependencies Janne From 45d384de90e3709a986700db14888eff77bb7e1f Mon Sep 17 00:00:00 2001 From: Janne Grunau <j(a)jannau.net> Date: Wed, 28 Jul 2010 23:53:35 +0200 Subject: [PATCH 1/2] V4L/DVB: staging/lirc: fix Kconfig dependencies Signed-off-by: Janne Grunau <j(a)jannau.net> --- drivers/staging/lirc/Kconfig | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig index 968c2ade..ab30a09 100644 --- a/drivers/staging/lirc/Kconfig +++ b/drivers/staging/lirc/Kconfig @@ -3,6 +3,7 @@ # menuconfig LIRC_STAGING bool "Linux Infrared Remote Control IR receiver/transmitter drivers" + depends on LIRC help Say Y here, and all supported Linux Infrared Remote Control IR and RF receiver and transmitter drivers will be displayed. When paired @@ -13,13 +14,13 @@ if LIRC_STAGING config LIRC_BT829 tristate "BT829 based hardware" - depends on LIRC_STAGING + depends on LIRC_STAGING && PCI help Driver for the IR interface on BT829-based hardware config LIRC_ENE0100 tristate "ENE KB3924/ENE0100 CIR Port Reciever" - depends on LIRC_STAGING + depends on LIRC_STAGING && PNP help This is a driver for CIR port handled by ENE KB3924 embedded controller found on some notebooks. @@ -27,7 +28,7 @@ config LIRC_ENE0100 config LIRC_I2C tristate "I2C Based IR Receivers" - depends on LIRC_STAGING + depends on LIRC_STAGING && I2C help Driver for I2C-based IR receivers, such as those commonly found onboard Hauppauge PVR-150/250/350 video capture cards @@ -40,7 +41,7 @@ config LIRC_IGORPLUGUSB config LIRC_IMON tristate "Legacy SoundGraph iMON Receiver and Display" - depends on LIRC_STAGING + depends on LIRC_STAGING && USB help Driver for the original SoundGraph iMON IR Receiver and Display @@ -48,7 +49,7 @@ config LIRC_IMON config LIRC_IT87 tristate "ITE IT87XX CIR Port Receiver" - depends on LIRC_STAGING + depends on LIRC_STAGING && PNP help Driver for the ITE IT87xx IR Receiver @@ -60,13 +61,13 @@ config LIRC_ITE8709 config LIRC_PARALLEL tristate "Homebrew Parallel Port Receiver" - depends on LIRC_STAGING && !SMP + depends on LIRC_STAGING && PARPORT && !SMP help Driver for Homebrew Parallel Port Receivers config LIRC_SASEM tristate "Sasem USB IR Remote" - depends on LIRC_STAGING + depends on LIRC_STAGING && USB help Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module @@ -91,7 +92,7 @@ config LIRC_SIR config LIRC_STREAMZAP tristate "Streamzap PC Receiver" - depends on LIRC_STAGING + depends on LIRC_STAGING && USB help Driver for the Streamzap PC Receiver @@ -103,7 +104,7 @@ config LIRC_TTUSBIR config LIRC_ZILOG tristate "Zilog/Hauppauge IR Transmitter" - depends on LIRC_STAGING + depends on LIRC_STAGING && I2C help Driver for the Zilog/Hauppauge IR Transmitter, found on PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards -- 1.7.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jarod Wilson on 29 Jul 2010 11:20 On Thu, Jul 29, 2010 at 8:39 AM, Janne Grunau <j(a)jannau.net> wrote: > On Thu, Jul 29, 2010 at 12:27:01AM -0400, Jarod Wilson wrote: >> On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod(a)wilsonet.com> wrote: >> > On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap(a)oracle.com> wrote: >> >> On 07/28/10 15:04, Janne Grunau wrote: >> >>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >> >>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >> >>>> >> >>>>> Hi all, >> >>>>> >> >>>>> Changes since 20100727: >> >>>> >> >>>> >> >>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >> >>>> >> >>> >> >>> following patch should fix it >> >>> >> >>> Janne >> >> >> >> Acked-by: Randy Dunlap <randy.dunlap(a)oracle.com> >> >> >> >> Thanks. >> > >> > Acked-by: Jarod Wilson <jarod(a)redhat.com> >> > >> > Indeed, thanks much, Janne! >> >> D'oh, I should have looked a bit closer... What if instead of making >> all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just >> depends on LIRC? > > I started adding LIRC to each driver by one. Adding LIRC as LIRC_STAGING > dependency is simpler. See updated patch. > >> And there are a few depends lines with duplicate >> USB's in them and LIRC_IMON should have USB added to it (technically, > > D'oh, I've must have stopped reading after LIRC_STAG... > > fixed and added additional dependencies Yeah, that looks better, thanks! (And this time I looked more carefully). Acked-by: Jarod Wilson <jarod(a)redhat.com> -- Jarod Wilson jarod(a)wilsonet.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Randy Dunlap on 29 Jul 2010 12:30
On 07/29/10 05:39, Janne Grunau wrote: > On Thu, Jul 29, 2010 at 12:27:01AM -0400, Jarod Wilson wrote: >> On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod(a)wilsonet.com> wrote: >>> On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap(a)oracle.com> wrote: >>>> On 07/28/10 15:04, Janne Grunau wrote: >>>>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >>>>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >>>>>> >>>>>>> Hi all, >>>>>>> >>>>>>> Changes since 20100727: >>>>>> >>>>>> >>>>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >>>>>> >>>>> >>>>> following patch should fix it >>>>> >>>>> Janne >>>> >>>> Acked-by: Randy Dunlap <randy.dunlap(a)oracle.com> >>>> >>>> Thanks. >>> >>> Acked-by: Jarod Wilson <jarod(a)redhat.com> >>> >>> Indeed, thanks much, Janne! >> >> D'oh, I should have looked a bit closer... What if instead of making >> all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just >> depends on LIRC? > > I started adding LIRC to each driver by one. Adding LIRC as LIRC_STAGING > dependency is simpler. See updated patch. > >> And there are a few depends lines with duplicate >> USB's in them and LIRC_IMON should have USB added to it (technically, > > D'oh, I've must have stopped reading after LIRC_STAG... > > fixed and added additional dependencies > > Janne Yes, this one works also. Thanks for the update. > > From 45d384de90e3709a986700db14888eff77bb7e1f Mon Sep 17 00:00:00 2001 > From: Janne Grunau <j(a)jannau.net> > Date: Wed, 28 Jul 2010 23:53:35 +0200 > Subject: [PATCH 1/2] V4L/DVB: staging/lirc: fix Kconfig dependencies > > Signed-off-by: Janne Grunau <j(a)jannau.net> > --- > drivers/staging/lirc/Kconfig | 19 ++++++++++--------- > 1 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig > index 968c2ade..ab30a09 100644 > --- a/drivers/staging/lirc/Kconfig > +++ b/drivers/staging/lirc/Kconfig > @@ -3,6 +3,7 @@ > # > menuconfig LIRC_STAGING > bool "Linux Infrared Remote Control IR receiver/transmitter drivers" > + depends on LIRC > help > Say Y here, and all supported Linux Infrared Remote Control IR and > RF receiver and transmitter drivers will be displayed. When paired > @@ -13,13 +14,13 @@ if LIRC_STAGING > > config LIRC_BT829 > tristate "BT829 based hardware" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && PCI > help > Driver for the IR interface on BT829-based hardware > > config LIRC_ENE0100 > tristate "ENE KB3924/ENE0100 CIR Port Reciever" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && PNP > help > This is a driver for CIR port handled by ENE KB3924 embedded > controller found on some notebooks. > @@ -27,7 +28,7 @@ config LIRC_ENE0100 > > config LIRC_I2C > tristate "I2C Based IR Receivers" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && I2C > help > Driver for I2C-based IR receivers, such as those commonly > found onboard Hauppauge PVR-150/250/350 video capture cards > @@ -40,7 +41,7 @@ config LIRC_IGORPLUGUSB > > config LIRC_IMON > tristate "Legacy SoundGraph iMON Receiver and Display" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && USB > help > Driver for the original SoundGraph iMON IR Receiver and Display > > @@ -48,7 +49,7 @@ config LIRC_IMON > > config LIRC_IT87 > tristate "ITE IT87XX CIR Port Receiver" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && PNP > help > Driver for the ITE IT87xx IR Receiver > > @@ -60,13 +61,13 @@ config LIRC_ITE8709 > > config LIRC_PARALLEL > tristate "Homebrew Parallel Port Receiver" > - depends on LIRC_STAGING && !SMP > + depends on LIRC_STAGING && PARPORT && !SMP > help > Driver for Homebrew Parallel Port Receivers > > config LIRC_SASEM > tristate "Sasem USB IR Remote" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && USB > help > Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module > > @@ -91,7 +92,7 @@ config LIRC_SIR > > config LIRC_STREAMZAP > tristate "Streamzap PC Receiver" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && USB > help > Driver for the Streamzap PC Receiver > > @@ -103,7 +104,7 @@ config LIRC_TTUSBIR > > config LIRC_ZILOG > tristate "Zilog/Hauppauge IR Transmitter" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && I2C > help > Driver for the Zilog/Hauppauge IR Transmitter, found on > PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |