diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 17:23:52 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-19 17:23:52 +0100 |
| commit | 1bc38a1d33a09949cfb6a12349e3c8dac867a5ab (patch) | |
| tree | e3fa41f522857e3416854368b59e2e08c571f55d /drivers/net/irda/Kconfig | |
| parent | ddf2965d77558eefee745c9dce22ad7ef5c7b88e (diff) | |
| parent | a92444c6b2225a9115d661c950cb48a22aeace20 (diff) | |
| download | linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.tar.gz linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.tar.bz2 linux-1bc38a1d33a09949cfb6a12349e3c8dac867a5ab.zip | |
Merge branch 'irq/for-arm' into irq/core
Pull the functionality which is required to cleanup sdhci/sdio
in. It's in a separate branch so it can be pulled from others
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/irda/Kconfig')
| -rw-r--r-- | drivers/net/irda/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 2dc82f1d2e70..3da44d5d9149 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -210,13 +210,6 @@ config KINGSUN_DONGLE To compile it as a module, choose M here: the module will be called kingsun-sir. -config EP7211_DONGLE - tristate "Cirrus Logic clps711x I/R support" - depends on IRTTY_SIR && ARCH_CLPS711X && IRDA - help - Say Y here if you want to build support for the Cirrus logic - EP7211 chipset's infrared module. - config KSDAZZLE_DONGLE tristate "KingSun Dazzle IrDA-USB dongle" depends on IRDA && USB |