From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 1 Dec 2010 07:25:37 +0000 (+0100)
Subject: Removed unsupported nodma switch from syslinux.cfg.
X-Git-Tag: v2.9-beta1~39
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=492b2601788ccca269986c55a0b090ccbf876498;ds=sidebyside

Removed unsupported nodma switch from syslinux.cfg.
---

diff --git a/config/syslinux/options.msg b/config/syslinux/options.msg
index a0b756b4b5..57a38c2f71 100644
--- a/config/syslinux/options.msg
+++ b/config/syslinux/options.msg
@@ -5,8 +5,6 @@
 
  -  To disable vga mode, type: 04novga <ENTER>07.  
 
- -  To enable dma support, type: 04dma <ENTER>07.
-
  -  To test the memory in your system type: 04memtest <ENTER>07.
 
  -  To install in unattended mode, type: 04unattended <ENTER>07.
@@ -27,4 +25,6 @@
 
 
 
+
+
 0f[F1-Main] [F2-Options]07
diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 361a3168e8..ac9bdc322a 100644
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -4,13 +4,10 @@ PROMPT 1
 F1 boot.msg
 F2 options.msg
 DEFAULT vmlinuz 
-  APPEND ide=nodma initrd=instroot vga=791 splash=silent ro
+  APPEND initrd=instroot vga=791 splash=silent ro
 LABEL novga
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot ro
-LABEL dma
-  KERNEL vmlinuz
-  APPEND initrd=instroot vga=791 splash=silent ro
+  APPEND initrd=instroot ro
 LABEL unattended
   KERNEL vmlinuz
   APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro