summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-22 09:48:22 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-22 09:48:22 -0800
commitecbe578aef6b4ce5b1d26f82df739ba61d3acfed (patch)
tree065cb6cb7d50e9d2d198699e956b022e8c24b1ab /etc
parent44e61ea3a1847eb7b8b39d87c20de9e2e8a0815d (diff)
downloadvyatta-cfg-ecbe578aef6b4ce5b1d26f82df739ba61d3acfed.tar.gz
vyatta-cfg-ecbe578aef6b4ce5b1d26f82df739ba61d3acfed.zip
Revert "Workaround issues with floppy formatting on some VM and hardware"
This reverts commit ba1376cd853e6b48cd3c6d32a71e5bb6672c3ff9. Conflicts: Makefile.am
Diffstat (limited to 'etc')
-rw-r--r--etc/modprobe.d/floppy.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/etc/modprobe.d/floppy.conf b/etc/modprobe.d/floppy.conf
deleted file mode 100644
index 7995f43..0000000
--- a/etc/modprobe.d/floppy.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Disable floppy DMA to workaround kernel bug in formatting
-# on some hardware/VM's
-options floppy floppy=nodma