diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /arch/avr32/Kconfig | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/avr32/Kconfig')
| -rw-r--r-- | arch/avr32/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index c75d7089f982..28e0caf4156c 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
| @@ -10,7 +10,6 @@ config AVR32 | |||
| 10 | # With EMBEDDED=n, we get lots of stuff automatically selected | 10 | # With EMBEDDED=n, we get lots of stuff automatically selected |
| 11 | # that we usually don't need on AVR32. | 11 | # that we usually don't need on AVR32. |
| 12 | select EMBEDDED | 12 | select EMBEDDED |
| 13 | select HAVE_IDE | ||
| 14 | select HAVE_OPROFILE | 13 | select HAVE_OPROFILE |
| 15 | select HAVE_KPROBES | 14 | select HAVE_KPROBES |
| 16 | help | 15 | help |