~ubuntu-branches/ubuntu/oneiric/oss4/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/arch_without_mregparm.patch

  • Committer: Bazaar Package Importer
  • Author(s): Stefano Rivera
  • Date: 2011-06-16 20:37:48 UTC
  • mfrom: (5.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110616203748-jbrxik6ql33z54co
Tags: 4.2-build2004-1ubuntu1
* Merge from Debian unstable.
  - Supports our current kernel (LP: #746048)
  Remaining changes:
  - debian/oss4-dkms.dkms.in: s/source/build/ in Kernel headers paths.
* ld-as-needed.patch: Re-order CC arguments to enable building with ld
  --as-needed (LP: #770972)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: oss-v4.2-build2000-src-gpl/setup/srcconf_linux.inc
 
1
Index: oss4-4.2-build2004/setup/srcconf_linux.inc
2
2
===================================================================
3
 
--- oss-v4.2-build2000-src-gpl.orig/setup/srcconf_linux.inc     2009-11-27 19:05:11.000000000 -0600
4
 
+++ oss-v4.2-build2000-src-gpl/setup/srcconf_linux.inc  2009-11-27 19:05:41.000000000 -0600
 
3
--- oss4-4.2-build2004.orig/setup/srcconf_linux.inc     2011-06-14 11:33:23.000000000 -0500
 
4
+++ oss4-4.2-build2004/setup/srcconf_linux.inc  2011-06-14 11:33:24.000000000 -0500
5
5
@@ -53,7 +53,9 @@
6
6
   fprintf (f,
7
7
             "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding%s\n", fnsp);