diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:44:09 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:44:09 +0000 |
| commit | 40ffdd5ac3747928d21a0a8243c7ffa15988c099 (patch) | |
| tree | c76d80aacb7273570819e6643005a6085f3d2776 /debian | |
| parent | 1d02eee47fdd18dd680ad684032b9d96509df9d1 (diff) | |
patches/libdde_fixes.patch: Remove, merged upstream
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/libdde_fixes.patch | 13 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index cda5e330..a9fdf6a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ hurd (20120710-1) UNRELEASED; urgency=low * New upstream snapshot. - patches/balloc.patch: Remove, merged upstream. - patches/libdde_config.patch: Remove, merged upstream. + - patches/libdde_fixes.patch: Remove, merged upstream. - patches/ext2fs_large_stores.patch: Refresh. -- Samuel Thibault <sthibault@debian.org> Tue, 10 Jul 2012 01:36:55 +0000 diff --git a/debian/patches/libdde_fixes.patch b/debian/patches/libdde_fixes.patch deleted file mode 100644 index 54d2cf1c..00000000 --- a/debian/patches/libdde_fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libdde_linux26/contrib/mm/dmapool.c b/libdde_linux26/contrib/mm/dmapool.c -index b1f0885..5c7aca4 100644 ---- a/libdde_linux26/contrib/mm/dmapool.c -+++ b/libdde_linux26/contrib/mm/dmapool.c -@@ -37,6 +37,8 @@ - #include <linux/types.h> - #include <linux/wait.h> - -+#include <ddekit/timer.h> -+ - #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB_DEBUG_ON) - #define DMAPOOL_DEBUG 1 - #endif diff --git a/debian/patches/series b/debian/patches/series index f55a1101..5372552b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,7 +43,6 @@ libdde_workqueue.patch libdde_trans_start.patch libdde_devres.patch libdde_pr_cont.patch -libdde_fixes.patch libdde_rx_queue.patch libdde_rcu.patch libmachdev.patch |