diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-29 19:40:09 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-29 19:40:09 +0000 |
| commit | dded3ca7e0cfceb939bfa91c80ca1f853abce7ae (patch) | |
| tree | 14ac69595a8efd830fa392e4a5a6e9f37f349b2d | |
| parent | 3775cf9797fe57174a9e841f5d42c2928c4022b3 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2004/12/29 20:07:01+01:00 uni-frankfurt.de!mickeyl
use busybox's modutils also for collie
2004/12/29 20:04:33+01:00 uni-frankfurt.de!mickeyl
yank the collie specific defconfig for busybox
BKrev: 41d30819s-xHH9k9fqmpr7mLgtnWvw
| -rw-r--r-- | conf/machine/collie.conf | 2 | ||||
| -rw-r--r-- | packages/busybox/busybox-1.00/collie/defconfig | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 51304b78d7..c43c70e8f0 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -7,7 +7,7 @@ IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules \ sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \ kernel-module-registers kernel-module-sa1100-bi kernel-module-usbdcore \ kernel-module-usbdmonitor" diff --git a/packages/busybox/busybox-1.00/collie/defconfig b/packages/busybox/busybox-1.00/collie/defconfig deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/collie/defconfig +++ /dev/null |