diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
| commit | 6b67b8c583b321bc955bc8efd24befe40d15e9fc (patch) | |
| tree | 61148cd550443788030ce27e3d7bee9fb9daf57e /libre/kernel26-libre-lts/buildfix-gcc46.diff | |
| parent | 8ba6ee51e836f2a5b78c7d6ca0096ddb5f847833 (diff) | |
| parent | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang-sdl/PKGBUILD
community/nautilus-sound-converter/PKGBUILD
community/shapelib/PKGBUILD
core/libarchive/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/evince/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/libgxps/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qt5/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
libre/kernel26-libre-lts/PKGBUILD
Diffstat (limited to 'libre/kernel26-libre-lts/buildfix-gcc46.diff')
| -rw-r--r-- | libre/kernel26-libre-lts/buildfix-gcc46.diff | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff deleted file mode 100644 index 595f97d66..000000000 --- a/libre/kernel26-libre-lts/buildfix-gcc46.diff +++ /dev/null @@ -1,32 +0,0 @@ -From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001 -From: Greg Rose <gregory.v.rose@intel.com> -Date: Tue, 16 Nov 2010 19:41:36 -0800 -Subject: [PATCH] Remove extra struct page member from the buffer info - structure - -declaration. - -Reported-by: Andi Kleen <andi@firstfloor.org> -Signed-off-by: Greg Rose <gregory.v.rose@intel.com> -Tested-by: Emil Tantilov <emil.s.tantilov@intel.com> -Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> ---- - drivers/net/igbvf/igbvf.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h -index 63284e3..9d4d63e 100644 ---- a/drivers/net/igbvf/igbvf.h -+++ b/drivers/net/igbvf/igbvf.h -@@ -126,7 +126,6 @@ struct igbvf_buffer { - unsigned int page_offset; - }; - }; -- struct page *page; - }; - - union igbvf_desc { --- -1.7.4.5 - - |