diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 16:07:19 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 16:07:19 +0100 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /arch/h8300/Kconfig | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
| download | blackbird-op-linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.tar.gz blackbird-op-linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.zip | |
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 bool default y +config GENERIC_BUG + bool + depends on BUG + config TIME_LOW_RES bool default y -config ARCH_SUPPORTS_AOUT - def_bool y - config NO_IOPORT def_bool y |
