From 7f90603174c35f5d71a738e69790ab00e4ad6397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Thu, 17 Mar 2005 15:47:07 +0000
Subject: merge with recent enough kernel and remove osbolete (unused) stuff,
 also do some 64-bit fixing there (forward port from cs3 and 10.1 branches)

---
 mdk-stage1/pcmcia_/yacc_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mdk-stage1/pcmcia_/yacc_config.c')

diff --git a/mdk-stage1/pcmcia_/yacc_config.c b/mdk-stage1/pcmcia_/yacc_config.c
index 79ec16eb5..2262d52f3 100644
--- a/mdk-stage1/pcmcia_/yacc_config.c
+++ b/mdk-stage1/pcmcia_/yacc_config.c
@@ -64,7 +64,7 @@ static int add_module(device_info_t *card, char *name);
 #line 65 "yacc_config.y"
 typedef union {
     char *str;
-    u_long num;
+    unsigned long num;
     struct device_info_t *device;
     struct card_info_t *card;
     struct mtd_ident_t *mtd;
-- 
cgit v1.2.1