diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-19 18:46:43 +0200 |
| commit | 43cdd088b1b10306d4eb6d9208b62c7f60abffeb (patch) | |
| tree | 8dd799379a241c1b47b736299c306eb77f06e6ff /arch/h8300 | |
| parent | bf69aa906ccddacc9e966794869431374953738a (diff) | |
| parent | 4028b6c4c03f213260e9290ff3a6b5439aad07ce (diff) | |
| download | op-kernel-dev-43cdd088b1b10306d4eb6d9208b62c7f60abffeb.zip op-kernel-dev-43cdd088b1b10306d4eb6d9208b62c7f60abffeb.tar.gz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 3d6759e..24b1dc2 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -2,7 +2,6 @@ config H8300 bool default y select HAVE_IDE - select HAVE_GENERIC_HARDIRQS select GENERIC_ATOMIC64 select HAVE_UID16 select VIRT_TO_BUS |
