From 230f0f4130998664e1666377d1771bc18e7f2d91 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Sat, 17 Jan 2015 21:49:20 +0000 Subject: [PATCH] [hppa] udeb: Fix duplicate modules in ata-modules, pata-modules [hppa] Create build-dependencies on binutils-hppa64 and gcc-4.9-hppa64 svn path=/dists/trunk/linux/; revision=22277 --- debian/changelog | 5 +++++ debian/config/hppa/defines | 2 +- debian/installer/hppa/modules/hppa/ata-modules | 1 + debian/installer/hppa/package-list | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d35ab82b6..72f54c9ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,11 @@ linux (3.18.3-1~exp1) UNRELEASED; urgency=medium * Add xhci-pci and xhci-plat-hcd to usb-modules udeb. (Inspired by #770912). * [armhf/armmp]: Enable support for Tegra124 based platforms. + [ Helge Deller ] + * [hppa] udeb: Fix duplicate modules in ata-modules, pata-modules + (Closes: #770102) + * [hppa] Create build-dependencies on binutils-hppa64 and gcc-4.9-hppa64 + -- Ian Campbell Thu, 11 Dec 2014 20:37:22 +0000 linux (3.18-1~exp1) experimental; urgency=medium diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines index d2f65b383..48991891e 100644 --- a/debian/config/hppa/defines +++ b/debian/config/hppa/defines @@ -22,5 +22,5 @@ hardware: multiprocessor 64-bit PA-RISC hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM [relations] -gcc-4.8: gcc-4.8, binutils-hppa64, gcc-4.8-hppa64 +gcc-4.9: gcc-4.9, binutils-hppa64, gcc-4.9-hppa64 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