diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-13 22:07:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-13 22:07:49 +0200 |
| commit | 985f03c2e95625ead38fbd5846b1360e20225117 (patch) | |
| tree | 5f02b2cb4f11e33a7e06856ba5fac26abb3e4096 /drivers/net | |
| parent | 68f4c319d613447746cbac3cd8f57357fdf2925a (diff) | |
| parent | 94bd32792e905ae25f63491f06d7d3018b350dd2 (diff) | |
| download | op-kernel-dev-985f03c2e95625ead38fbd5846b1360e20225117.zip op-kernel-dev-985f03c2e95625ead38fbd5846b1360e20225117.tar.gz | |
Merge branch 'clps711x/cleanup' into next/cleanup
* clps711x/cleanup:
ARM: clps711x: Combine header files into one for clps711x-targets
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/irda/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 4680478..e7ecd3f 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -211,8 +211,8 @@ config KINGSUN_DONGLE kingsun-sir. config EP7211_DONGLE - tristate "EP7211 I/R support" - depends on IRTTY_SIR && ARCH_EP7211 && IRDA && EXPERIMENTAL + tristate "Cirrus Logic clps711x I/R support" + depends on IRTTY_SIR && ARCH_CLPS711X && IRDA && EXPERIMENTAL help Say Y here if you want to build support for the Cirrus logic EP7211 chipset's infrared module. |
