diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-11-11 17:34:32 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-11-11 17:34:32 +0000 |
| commit | 930f446a7d770417e5c444fd9d2c5060d869a172 (patch) | |
| tree | 026d814ec1ba12219543b4ffdf2ab940e7e4e4ea /target | |
| parent | 8a0e507163acad29eb390f3495f269a8132b25c1 (diff) | |
| download | upstream-930f446a7d770417e5c444fd9d2c5060d869a172.tar.gz upstream-930f446a7d770417e5c444fd9d2c5060d869a172.tar.bz2 upstream-930f446a7d770417e5c444fd9d2c5060d869a172.zip | |
AA: brcm47xx: backport r34150: remove ssb-gige package
CONFIG_SSB_DRIVER_GIGE is set in the target config of the brcm47xx target, so it will always be activated and the kmod-ssb-gige is not needed any more.
The kmod-ssb-gige package is not generated in an build as it does not contain any files and the makes the image builder fail when generating a image integrating this package.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34151 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm47xx/modules.mk | 13 | ||||
| -rw-r--r-- | target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/profiles/115-Bcm4705-none.mk | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/profiles/WRT350Nv1.mk | 2 |
4 files changed, 3 insertions, 16 deletions
diff --git a/target/linux/brcm47xx/modules.mk b/target/linux/brcm47xx/modules.mk index 9a724cb3b1..abc2c9c003 100644 --- a/target/linux/brcm47xx/modules.mk +++ b/target/linux/brcm47xx/modules.mk @@ -21,19 +21,6 @@ endef $(eval $(call KernelPackage,usb-brcm47xx)) -define KernelPackage/ssb-gige - TITLE:=Broadcom SSB Gigabit Ethernet - KCONFIG:=CONFIG_SSB_DRIVER_GIGE=y - DEPENDS:=@TARGET_brcm47xx +kmod-tg3 - SUBMENU:=$(NETWORK_DEVICES_MENU) -endef - -define KernelPackage/ssb-gige/description - Kernel modules for Broadcom SSB Gigabit Ethernet adapters. -endef - -$(eval $(call KernelPackage,ssb-gige)) - define KernelPackage/ocf-ubsec-ssb TITLE:=BCM5365P IPSec Core driver diff --git a/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk b/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk index f5bdaac50c..9d3e357f25 100644 --- a/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk +++ b/target/linux/brcm47xx/profiles/110-Bcm4705-b43.mk @@ -7,7 +7,7 @@ define Profile/Bcm4705-b43 NAME:=BCM4705/BCM4785, Broadcom BCM43xx WiFi (b43) - PACKAGES:=kmod-b43 kmod-b43legacy kmod-tg3 kmod-ssb-gige + PACKAGES:=kmod-b43 kmod-b43legacy kmod-tg3 kmod-tg3 endef define Profile/Broadcom-b43/Description diff --git a/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk b/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk index 5b03f2c5ec..5875fd97f3 100644 --- a/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk +++ b/target/linux/brcm47xx/profiles/115-Bcm4705-none.mk @@ -7,7 +7,7 @@ define Profile/Bcm4705-none NAME:=BCM4705/BCM4785, no WiFi - PACKAGES:=-wpad-mini kmod-tg3 kmod-ssb-gige + PACKAGES:=-wpad-mini kmod-tg3 kmod-tg3 endef define Profile/None/Description diff --git a/target/linux/brcm47xx/profiles/WRT350Nv1.mk b/target/linux/brcm47xx/profiles/WRT350Nv1.mk index 82be93aa88..c861615aad 100644 --- a/target/linux/brcm47xx/profiles/WRT350Nv1.mk +++ b/target/linux/brcm47xx/profiles/WRT350Nv1.mk @@ -7,7 +7,7 @@ define Profile/WRT350Nv1 NAME:=Linksys WRT350Nv1 - PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ssb-gige kmod-ocf-ubsec-ssb + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-tg3 kmod-ocf-ubsec-ssb endef define Profile/WRT350Nv1/Description |