← Back to branch summary

~ubuntu-branches/ubuntu/precise/speakup/precise

« back to all changes in this revision

Viewing changes to patches/build-integration-2.6.26.patch

  • Committer: Bazaar Package Importer
  • Author(s): Samuel Thibault
  • Date: 2010-08-24 21:34:33 UTC
  • mfrom: (1.3.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20100824213433-suy4gzzolbzkhsgu
Tags: 3.1.5.dfsg.1-1
* New upstream fix-only release.
  Also cherry-pick upstream fixes up to de98895e.
* debian/control: Bump Standards-Version to 3.9.1 (no change needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/build-integration-2.6.26.patch
1
 
diff --git a/drivers/accessibility/Kconfig b/drivers/accessibility/Kconfig
2
 
index 1264c4b..e82d1d7 100644
3
 
--- a/drivers/accessibility/Kconfig
4
 
+++ b/drivers/accessibility/Kconfig
5
 
@@ -20,4 +20,6 @@ config A11Y_BRAILLE_CONSOLE
6
 
 
7
 
          If unsure, say N.
8
 
 
9
 
+source "drivers/accessibility/speakup/Kconfig"
10
 
+
11
 
 endif # ACCESSIBILITY
12
 
diff --git a/drivers/accessibility/Makefile b/drivers/accessibility/Makefile
13
 
index 72b01a4..ef0d3a5 100644
14
 
--- a/drivers/accessibility/Makefile
15
 
+++ b/drivers/accessibility/Makefile
16
 
@@ -1 +1,2 @@
17
 
 obj-y                          += braille/
18
 
+obj-$(CONFIG_SPEAKUP)          += speakup/