From 7c4523ed3de1cb0e5ea25d8e452c946232449ed4 Mon Sep 17 00:00:00 2001
From: Frederic Lepied <flepied@mandriva.com>
Date: Thu, 9 Aug 2001 08:10:59 +0000
Subject: merge back 0.15-17mdk in CVS

---
 conf/server.5 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf/server.5')

diff --git a/conf/server.5 b/conf/server.5
index 044f0bf..b275405 100644
--- a/conf/server.5
+++ b/conf/server.5
@@ -4,3 +4,4 @@ keytable
 network
 gpm
 xfs
+pcmcia
-- 
cgit v1.2.1