From 62d6f9d4a14aa04a9ef3c8f32658aac1ca3a3242 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 26 May 2004 21:45:24 +0000
Subject: disable CONFIG_PCMCIA_PROBE for collie
BKrev: 40b50ff4Jnot0aUkcn-SOTF8xNOhkA
---
dviviewer/dviviewer_1.0.1.oe | 20 --------------------
dviviewer/dviviewer_1.0.2.oe | 0
.../defconfig-collie | 4 ++--
3 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 dviviewer/dviviewer_1.0.1.oe
create mode 100644 dviviewer/dviviewer_1.0.2.oe
diff --git a/dviviewer/dviviewer_1.0.1.oe b/dviviewer/dviviewer_1.0.1.oe
deleted file mode 100644
index 95f7d964e9..0000000000
--- a/dviviewer/dviviewer_1.0.1.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "DVI Viewer for Opie/Qtopia"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc"
-
-SRC_URI = "http://www013.upp.so-net.ne.jp/hn43o/dviviewer/dviviewer-${PV}.tar.gz"
-S = "${WORKDIR}/dviviewer"
-
-inherit palmtop
-
-do_install() {
- install -d ${D}/${palmtopdir}/bin \
- ${D}/${palmtopdir}/apps/Applications \
- ${D}/${palmtopdir}/pics
- install -D -m 755 dviviewer ${D}/${palmtopdir}/bin/dviviewer
- install -D -m 644 dviviewer.desktop ${D}/${palmtopdir}/Applications/dviviewer.desktop
- install -d ${D}/${palmtopdir}/pics
- cp -a *.png ${D}/${palmtopdir}/pics/
-}
diff --git a/dviviewer/dviviewer_1.0.2.oe b/dviviewer/dviviewer_1.0.2.oe
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
index 40255c51a0..7634456e97 100644
--- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
+++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
@@ -174,7 +174,7 @@ CONFIG_HOTPLUG=y
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
-CONFIG_PCMCIA_PROBE=y
+# CONFIG_PCMCIA_PROBE is not set
# CONFIG_I82092 is not set
# CONFIG_I82365 is not set
# CONFIG_TCIC is not set
@@ -199,7 +199,7 @@ CONFIG_APM_CPU_IDLE=y
CONFIG_APM_DISPLAY_BLANK=y
CONFIG_APM_RTC_IS_GMT=y
# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphaned_inodes=delete console=null mem=16M probe_io=0"
+CONFIG_CMDLINE="See OE File"
# CONFIG_SHARPSL_BOOTLDR_PARAMS is not set
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
--
cgit v1.2.3