diff options
| author | Ingo Molnar | 2011-06-16 13:23:15 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2011-06-16 13:23:22 +0200 |
| commit | b4f9f2b64aa189c5584f266f4f0343af7a705441 (patch) | |
| tree | f410718bb93590ff61682b566c10f70d5883bbcd /arch/unicore32/Kconfig | |
| parent | perf: Split up buffer handling from core code (diff) | |
| parent | Linux 3.0-rc3 (diff) | |
| download | kernel-qcow2-linux-b4f9f2b64aa189c5584f266f4f0343af7a705441.tar.gz kernel-qcow2-linux-b4f9f2b64aa189c5584f266f4f0343af7a705441.tar.xz kernel-qcow2-linux-b4f9f2b64aa189c5584f266f4f0343af7a705441.zip | |
Merge commit 'v3.0-rc3' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/unicore32/Kconfig')
| -rw-r--r-- | arch/unicore32/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index d3a303246c9f..e57dcce9bfda 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -231,10 +231,6 @@ config PUV3_PWM help Enable support for NB0916 PWM controllers -config PUV3_RTC - tristate "PKUnity v3 RTC Support" - depends on !ARCH_FPGA - if PUV3_NB0916 menu "PKUnity NetBook-0916 Features" |