diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /arch/h8300/Kconfig | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'arch/h8300/Kconfig')
| -rw-r--r-- | arch/h8300/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 2b413325e885..7789c3d82d3c 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
| @@ -62,13 +62,14 @@ config GENERIC_TIME | |||
| 62 | bool | 62 | bool |
| 63 | default y | 63 | default y |
| 64 | 64 | ||
| 65 | config GENERIC_BUG | ||
| 66 | bool | ||
| 67 | depends on BUG | ||
| 68 | |||
| 65 | config TIME_LOW_RES | 69 | config TIME_LOW_RES |
| 66 | bool | 70 | bool |
| 67 | default y | 71 | default y |
| 68 | 72 | ||
| 69 | config ARCH_SUPPORTS_AOUT | ||
| 70 | def_bool y | ||
| 71 | |||
| 72 | config NO_IOPORT | 73 | config NO_IOPORT |
| 73 | def_bool y | 74 | def_bool y |
| 74 | 75 | ||