Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353629
b: refs/heads/master
c: 89a0677
h: refs/heads/master
i:
  353627: c51bda3
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent 9a1b731 commit 40fd191
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ec9b067bf68c93882650785b18b379cc0c36df6
refs/heads/master: 89a0677b7cc5c3f2c2738ec815081c8b1ea50695
6 changes: 2 additions & 4 deletions trunk/arch/blackfin/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -562,8 +562,7 @@ choice
accurate - This option is therefore marked experimental.

config BFIN_KERNEL_CLOCK_MEMINIT_CALC
bool "Calculate Timings (EXPERIMENTAL)"
depends on EXPERIMENTAL
bool "Calculate Timings"

config BFIN_KERNEL_CLOCK_MEMINIT_SPEC
bool "Provide accurate Timings based on target SCLK"
Expand Down Expand Up @@ -1120,7 +1119,7 @@ endchoice

comment "Memory Protection Unit"
config MPU
bool "Enable the memory protection unit (EXPERIMENTAL)"
bool "Enable the memory protection unit"
default n
help
Use the processor's MPU to protect applications from accessing
Expand Down Expand Up @@ -1442,7 +1441,6 @@ config BFIN_CPU_FREQ

config CPU_VOLTAGE
bool "CPU Voltage scaling"
depends on EXPERIMENTAL
depends on CPU_FREQ
default n
help
Expand Down

0 comments on commit 40fd191

Please sign in to comment.