summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Newton <miken32@gmail.com>2013-02-02 09:19:30 -0800
committerMichael Newton <miken32@gmail.com>2013-02-02 09:19:30 -0800
commitc02ef67f8fa7825f2859293c4c0ddeb5b2d9abb8 (patch)
treeba8c63cb729320833c6c51f9fefbb0f63e8f2975
parentf48abba23bdb216455b6505fec990dee8de7f57e (diff)
parent49b12e444ede8b9da4e85cb594df15793433e7f0 (diff)
downloadpfsense-c02ef67f8fa7825f2859293c4c0ddeb5b2d9abb8.zip
pfsense-c02ef67f8fa7825f2859293c4c0ddeb5b2d9abb8.tar.gz
Merge remote-tracking branch 'upstream/master' into reverseacct
-rw-r--r--boot/loader.conf_wrap3
1 files changed, 2 insertions, 1 deletions
diff --git a/boot/loader.conf_wrap b/boot/loader.conf_wrap
index 77d70ca..6e7d9aa 100644
--- a/boot/loader.conf_wrap
+++ b/boot/loader.conf_wrap
@@ -7,4 +7,5 @@ hw.ata.wc="0"
kern.ipc.nmbclusters="0"
beastie_disable="YES"
vm.kmem_size="435544320"
-vm.kmem_size_max="535544320" \ No newline at end of file
+vm.kmem_size_max="535544320"
+hw.usb.no_pf="1"
OpenPOWER on IntegriCloud