diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-30 03:39:53 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-09-13 09:09:52 -0400 |
| commit | 0244ad004a54e39308d495fee0a2e637f8b5c317 (patch) | |
| tree | b59152dc7cf57e7ffb9c8388ae9095e665406633 /sound | |
| parent | 5a7d8a28080caed7fd4cb1b81d092adac4445e8e (diff) | |
Remove GENERIC_HARDIRQ config option
After the last architecture switched to generic hard irqs the config
options HAVE_GENERIC_HARDIRQS & GENERIC_HARDIRQS and the related code
for !CONFIG_GENERIC_HARDIRQS can be removed.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/samsung/Kconfig | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 15106c045478..b33b45dfceec 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -107,7 +107,7 @@ config SND_SOC_ALL_CODECS | |||
| 107 | select SND_SOC_WM8782 | 107 | select SND_SOC_WM8782 |
| 108 | select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI | 108 | select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI |
| 109 | select SND_SOC_WM8900 if I2C | 109 | select SND_SOC_WM8900 if I2C |
| 110 | select SND_SOC_WM8903 if I2C && GENERIC_HARDIRQS | 110 | select SND_SOC_WM8903 if I2C |
| 111 | select SND_SOC_WM8904 if I2C | 111 | select SND_SOC_WM8904 if I2C |
| 112 | select SND_SOC_WM8940 if I2C | 112 | select SND_SOC_WM8940 if I2C |
| 113 | select SND_SOC_WM8955 if I2C | 113 | select SND_SOC_WM8955 if I2C |
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 9855dfc3e3ec..2eea1840315d 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
| @@ -63,7 +63,7 @@ config SND_SOC_SAMSUNG_SMDK_WM8580 | |||
| 63 | config SND_SOC_SAMSUNG_SMDK_WM8994 | 63 | config SND_SOC_SAMSUNG_SMDK_WM8994 |
| 64 | tristate "SoC I2S Audio support for WM8994 on SMDK" | 64 | tristate "SoC I2S Audio support for WM8994 on SMDK" |
| 65 | depends on SND_SOC_SAMSUNG | 65 | depends on SND_SOC_SAMSUNG |
| 66 | depends on I2C=y && GENERIC_HARDIRQS | 66 | depends on I2C=y |
| 67 | select MFD_WM8994 | 67 | select MFD_WM8994 |
| 68 | select SND_SOC_WM8994 | 68 | select SND_SOC_WM8994 |
| 69 | select SND_SAMSUNG_I2S | 69 | select SND_SAMSUNG_I2S |
| @@ -151,7 +151,7 @@ config SND_SOC_SMARTQ | |||
| 151 | config SND_SOC_GONI_AQUILA_WM8994 | 151 | config SND_SOC_GONI_AQUILA_WM8994 |
| 152 | tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" | 152 | tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" |
| 153 | depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) | 153 | depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) |
| 154 | depends on I2C=y && GENERIC_HARDIRQS | 154 | depends on I2C=y |
| 155 | select SND_SAMSUNG_I2S | 155 | select SND_SAMSUNG_I2S |
| 156 | select MFD_WM8994 | 156 | select MFD_WM8994 |
| 157 | select SND_SOC_WM8994 | 157 | select SND_SOC_WM8994 |
| @@ -177,7 +177,7 @@ config SND_SOC_SMDK_WM8580_PCM | |||
| 177 | config SND_SOC_SMDK_WM8994_PCM | 177 | config SND_SOC_SMDK_WM8994_PCM |
| 178 | tristate "SoC PCM Audio support for WM8994 on SMDK" | 178 | tristate "SoC PCM Audio support for WM8994 on SMDK" |
| 179 | depends on SND_SOC_SAMSUNG | 179 | depends on SND_SOC_SAMSUNG |
| 180 | depends on I2C=y && GENERIC_HARDIRQS | 180 | depends on I2C=y |
| 181 | select MFD_WM8994 | 181 | select MFD_WM8994 |
| 182 | select SND_SOC_WM8994 | 182 | select SND_SOC_WM8994 |
| 183 | select SND_SAMSUNG_PCM | 183 | select SND_SAMSUNG_PCM |