diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /arch/openrisc/Kconfig | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'arch/openrisc/Kconfig')
| -rw-r--r-- | arch/openrisc/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 014a6482ed4c..9ab3bf2eca8d 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig | |||
| @@ -9,10 +9,9 @@ config OPENRISC | |||
| 9 | select OF_EARLY_FLATTREE | 9 | select OF_EARLY_FLATTREE |
| 10 | select IRQ_DOMAIN | 10 | select IRQ_DOMAIN |
| 11 | select HAVE_MEMBLOCK | 11 | select HAVE_MEMBLOCK |
| 12 | select ARCH_WANT_OPTIONAL_GPIOLIB | 12 | select ARCH_REQUIRE_GPIOLIB |
| 13 | select HAVE_ARCH_TRACEHOOK | 13 | select HAVE_ARCH_TRACEHOOK |
| 14 | select HAVE_GENERIC_HARDIRQS | 14 | select HAVE_GENERIC_HARDIRQS |
| 15 | select HAVE_VIRT_TO_BUS | ||
| 16 | select GENERIC_IRQ_CHIP | 15 | select GENERIC_IRQ_CHIP |
| 17 | select GENERIC_IRQ_PROBE | 16 | select GENERIC_IRQ_PROBE |
| 18 | select GENERIC_IRQ_SHOW | 17 | select GENERIC_IRQ_SHOW |