summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic5
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index 0e1c3cb57..f948700b2 100644
--- a/config-generic
+++ b/config-generic
@@ -4220,10 +4220,9 @@ CONFIG_IEEE802154_FAKEHARD=m
# CONFIG_GCOV_KERNEL is not set
-### is this generally useful?
-# CONFIG_PPS is not set
+CONFIG_PPS=m
# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
+CONFIG_PPS_CLIENT_LDISC=m
# CONFIG_PPS_DEBUG is not set
# CONFIG_USB_SERIAL_QUATECH2 is not set
diff --git a/kernel.spec b/kernel.spec
index f4bd69259..d9a85b402 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1864,6 +1864,9 @@ fi
# || ||
%changelog
+* Fri Jul 30 2010 Dave Jones <davej@redhat.com>
+- Enable PPS (#619392)
+
* Thu Jul 29 2010 Dave Jones <davej@redhat.com>
- 2.6.35-rc6-git5