diff --git a/debian/changelog b/debian/changelog index f68adb772..00480cd07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ linux (3.10~rc5-1~exp1) UNRELEASED; urgency=low - [s390] Use symlinks to follow s390x configuration - [sparc64] Use symlinks to follow sparc configuration - Only list the 'new' firewire modules in firewire-core-modules + - Remove obsolete eth1394 and firewire-core-modules dependency from + nic-modules -- Ben Hutchings Mon, 03 Jun 2013 13:21:56 +0100 diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list index 9fcd9a764..7f61e1560 100644 --- a/debian/installer/amd64/package-list +++ b/debian/installer/amd64/package-list @@ -7,8 +7,5 @@ Package: fat-modules Priority: standard -Package: nic-modules -Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules - Package: scsi-modules Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list index 391ae480f..0f3e8d3e9 100644 --- a/debian/installer/i386/package-list +++ b/debian/installer/i386/package-list @@ -10,8 +10,5 @@ Provides: rtc-modules Package: fat-modules Priority: standard -Package: nic-modules -Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules - Package: fb-modules Depends: kernel-image, i2c-modules diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list index 0e3de0bc6..a5cee4179 100644 --- a/debian/installer/ia64/package-list +++ b/debian/installer/ia64/package-list @@ -10,7 +10,7 @@ Package: ide-modules Depends: kernel-image, ide-core-modules, sn-modules Package: nic-modules -Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules +Depends: kernel-image, nic-shared-modules, core-modules, crc-modules Package: serial-modules Depends: kernel-image, pcmcia-modules, sn-modules diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules index 6fc0863ab..5cbbed75f 100644 --- a/debian/installer/modules/nic-modules +++ b/debian/installer/modules/nic-modules @@ -7,7 +7,6 @@ ne2k-pci tg3 ? tulip winbond-840 -eth1394 ? xen-netfront ? # PHY driver, may be needed by tg3 diff --git a/debian/installer/sh4/package-list b/debian/installer/sh4/package-list index 8d1891f5e..bbf700dc4 100644 --- a/debian/installer/sh4/package-list +++ b/debian/installer/sh4/package-list @@ -5,6 +5,3 @@ # Package: kernel-image Provides: event-modules, ext3-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules - -Package: nic-modules -Depends: kernel-image, core-modules, firewire-core-modules