summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-03 23:54:09 +0000
committerwdenk <wdenk>2003-06-03 23:54:09 +0000
commit682011ff6968198da14b89e40d9f55b00f6d91f7 (patch)
tree18793a72134a5262daf281ab0b904ab16f5337ac /common
parent7a8e9bed17d7924a9c5c4699b1f6a3a0359524ed (diff)
downloadtalos-obmc-uboot-682011ff6968198da14b89e40d9f55b00f6d91f7.tar.gz
talos-obmc-uboot-682011ff6968198da14b89e40d9f55b00f6d91f7.zip
* 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. * 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
Diffstat (limited to 'common')
-rw-r--r--common/devices.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/devices.c b/common/devices.c
index 615b2171c2..1f88fd5e34 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 ();
OpenPOWER on IntegriCloud