From 229e5f2917d483b6b5fe39519fce040e3cb9a341 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 20 Jun 2007 12:23:33 +0200 Subject: [PATCH] --- yaml --- r: 57884 b: refs/heads/master c: 0e52d3281f8aa6486949478ea95c8ca85c3ffab5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/Kconfig | 3 --- trunk/drivers/input/keyboard/Kconfig | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b1126e55b6ef..8928b58cb438 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 388c19e176436707eb30a81c7e4129e08769f92b +refs/heads/master: 0e52d3281f8aa6486949478ea95c8ca85c3ffab5 diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig index 85cdd23b0447..a86e2e9a639f 100644 --- a/trunk/arch/m68k/Kconfig +++ b/trunk/arch/m68k/Kconfig @@ -418,9 +418,6 @@ config STRAM_PROC help Say Y here to report ST-RAM usage statistics in /proc/stram. -config ATARI_KBD_CORE - bool - config HEARTBEAT bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40 default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300 diff --git a/trunk/drivers/input/keyboard/Kconfig b/trunk/drivers/input/keyboard/Kconfig index bd707b86c114..c97d5eb0075d 100644 --- a/trunk/drivers/input/keyboard/Kconfig +++ b/trunk/drivers/input/keyboard/Kconfig @@ -164,6 +164,9 @@ config KEYBOARD_AMIGA To compile this driver as a module, choose M here: the module will be called amikbd. +config ATARI_KBD_CORE + bool + config KEYBOARD_ATARI tristate "Atari keyboard" depends on ATARI