diff options
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/Kconfig | 4 | ||||
| -rw-r--r-- | arch/h8300/include/asm/gpio-internal.h (renamed from arch/h8300/include/asm/gpio.h) | 0 | ||||
| -rw-r--r-- | arch/h8300/platform/h8300h/irq.c | 2 | ||||
| -rw-r--r-- | arch/h8300/platform/h8s/irq.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 091ed6192ae8..d1f377f5d3b6 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -160,7 +160,7 @@ config VT_CONSOLE config HW_CONSOLE bool - depends on VT && !S390 && !UM + depends on VT default y comment "Unix98 PTY support" @@ -195,7 +195,7 @@ config UNIX98_PTYS source "drivers/char/pcmcia/Kconfig" -source "drivers/serial/Kconfig" +source "drivers/tty/serial/Kconfig" source "drivers/i2c/Kconfig" diff --git a/arch/h8300/include/asm/gpio.h b/arch/h8300/include/asm/gpio-internal.h index a714f0c0efbc..a714f0c0efbc 100644 --- a/arch/h8300/include/asm/gpio.h +++ b/arch/h8300/include/asm/gpio-internal.h diff --git a/arch/h8300/platform/h8300h/irq.c b/arch/h8300/platform/h8300h/irq.c index e977345105d7..bc4f51bceef5 100644 --- a/arch/h8300/platform/h8300h/irq.c +++ b/arch/h8300/platform/h8300h/irq.c @@ -11,7 +11,7 @@ #include <asm/traps.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/gpio.h> +#include <asm/gpio-internal.h> #include <asm/regs306x.h> const int __initdata h8300_saved_vectors[] = { diff --git a/arch/h8300/platform/h8s/irq.c b/arch/h8300/platform/h8s/irq.c index 8182f041f829..7b5f29febc07 100644 --- a/arch/h8300/platform/h8s/irq.c +++ b/arch/h8300/platform/h8s/irq.c @@ -14,7 +14,7 @@ #include <asm/traps.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/gpio.h> +#include <asm/gpio-internal.h> #include <asm/regs267x.h> /* saved vector list */ |