diff options
| author | Greg Kroah-Hartman | 2015-09-29 01:52:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-09-29 01:52:40 +0200 |
| commit | bcabc6f32888435932364702ebf368164dea6678 (patch) | |
| tree | 34e88561ca4acf1b663e972ea48e7f3e3f4c9efc /drivers/staging/most/hdm-dim2 | |
| parent | Staging: rts5208: Coding style warnings fix for block comments (diff) | |
| parent | Linux 4.3-rc3 (diff) | |
| download | kernel-qcow2-linux-bcabc6f32888435932364702ebf368164dea6678.tar.gz kernel-qcow2-linux-bcabc6f32888435932364702ebf368164dea6678.tar.xz kernel-qcow2-linux-bcabc6f32888435932364702ebf368164dea6678.zip | |
Merge 4.3-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/most/hdm-dim2')
| -rw-r--r-- | drivers/staging/most/hdm-dim2/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/most/hdm-dim2/Kconfig b/drivers/staging/most/hdm-dim2/Kconfig index 1d4ad1d67758..fc548769479b 100644 --- a/drivers/staging/most/hdm-dim2/Kconfig +++ b/drivers/staging/most/hdm-dim2/Kconfig @@ -5,6 +5,7 @@ config HDM_DIM2 tristate "DIM2 HDM" depends on AIM_NETWORK + depends on HAS_IOMEM ---help--- Say Y here if you want to connect via MediaLB to network transceiver. |