From 682011ff6968198da14b89e40d9f55b00f6d91f7 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 3 Jun 2003 23:54:09 +0000
Subject: * Patches by Udi Finkelstein, 2 June 2003:   - Added support for
 custom keyboards, initialized by defining a     board-specific
 drv_keyboard_init as well as defining CONFIG_KEYBOARD .   - Added support for
 the RBC823 board.   - cpu/mpc8xx/lcd.c now automatically calculates the    
 Horizontal Pixel Count field.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix alignment problem in BOOTP (dhcp_leasetime option)
  [pointed out by Nicolas Lacressonnière, 2 Jun 2003]

* Patch by Mark Rakes, 14 May 2003:
  add support for Intel e1000 gig cards.

* Patch by Nye Liu, 3 Jun 2003:
  fix critical typo in MAMR definition (include/mpc8xx.h)

* Fix requirement to align U-Boot image on 16 kB boundaries on PPC.

* Patch by Klaus Heydeck, 2 Jun 2003
  Minor changes for KUP4K configuration
---
 common/devices.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/devices.c')

diff --git a/common/devices.c b/common/devices.c
index 615b2171c22..1f88fd5e34d 100644
--- a/common/devices.c
+++ b/common/devices.c
@@ -185,8 +185,8 @@ int devices_init (void)
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
 	drv_video_init ();
 #endif
-#ifdef CONFIG_WL_4PPM_KEYBOARD
-	drv_wlkbd_init ();
+#ifdef CONFIG_KEYBOARD
+	drv_keyboard_init ();
 #endif
 #ifdef CONFIG_LOGBUFFER
 	drv_logbuff_init ();
-- 
cgit v1.2.3