From 2165116cd92eba5b76b557fdd0a18cb5bd15aef9 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 17 Jan 2015 09:54:16 +0000 Subject: [PATCH] [hppa] udeb: Fix duplicate modules in ata-modules, pata-modules (thanks to Helge Deller) (Closes: #770102) svn path=/dists/sid/linux/; revision=22276 --- debian/changelog | 4 ++++ debian/installer/hppa/modules/hppa/ata-modules | 1 + debian/installer/hppa/package-list | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 908c46498..8e09db583 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ linux (3.16.7-ckt4-2) UNRELEASED; urgency=medium * [arm64] udeb: Remove zlib-modules, as ZLIB_DEFLATE is now built-in (fixes FTBFS) + [ Ben Hutchings ] + * [hppa] udeb: Fix duplicate modules in ata-modules, pata-modules + (thanks to Helge Deller) (Closes: #770102) + -- Ian Campbell Fri, 16 Jan 2015 15:14:32 +0000 linux (3.16.7-ckt4-1) unstable; urgency=medium diff --git a/debian/installer/hppa/modules/hppa/ata-modules b/debian/installer/hppa/modules/hppa/ata-modules index b81c0f38b..be78de0c1 100644 --- a/debian/installer/hppa/modules/hppa/ata-modules +++ b/debian/installer/hppa/modules/hppa/ata-modules @@ -1 +1,2 @@ #include +libata - diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list index 22d182a93..edbeff4ec 100644 --- a/debian/installer/hppa/package-list +++ b/debian/installer/hppa/package-list @@ -12,7 +12,7 @@ Package: ide-modules Depends: kernel-image, ide-core-modules, nls-core-modules Package: pata-modules -Depends: kernel-image, scsi-core-modules +Depends: kernel-image, ata-modules, scsi-core-modules Package: fb-modules Depends: kernel-image