From c8b14fa8f03de924366021b375f2b8e6c9ff41a8 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 29 Oct 2007 22:19:08 +0000 Subject: [PATCH] Move nvram out of DEFAULTS. There really isn't a lot of justification for consuming the memory. The module works just fine in the unlikely case that this is needed. It can still be compiled into a custom kernel. --- sys/amd64/conf/DEFAULTS | 1 - sys/amd64/conf/NOTES | 3 +++ sys/i386/conf/DEFAULTS | 1 - sys/i386/conf/NOTES | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 519198c5171a..e98b16998b62 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -11,7 +11,6 @@ device isa # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device -device nvram # Access to rtc cmos via /dev/nvram # UART chips on this platform device uart_ns8250 diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index f0208d933d43..207fa07e037e 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -97,6 +97,9 @@ options CLK_CALIBRATION_LOOP # clock to actually be used. options CLK_USE_I8254_CALIBRATION +# Provide read/write access to the memory in the clock chip. +device nvram # Access to rtc cmos via /dev/nvram + ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 2e459f0ddd91..a5f69a13725a 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -15,7 +15,6 @@ device npx # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device -device nvram # Access to rtc cmos via /dev/nvram # UART chips on this platform device uart_ns8250 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 10c99f33c5ba..f73add963c58 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -268,6 +268,9 @@ options CLK_CALIBRATION_LOOP # clock to actually be used. options CLK_USE_I8254_CALIBRATION +# Provide read/write access to the memory in the clock chip. +device nvram # Access to rtc cmos via /dev/nvram + ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS