Menu
▾
▴
[linuxsh-dev] 2.5.24
|
From: NIIBE Y. <gn...@m1...> - 2002-06-26 01:54:18
|
Changes from mainline included.
2002-06-26 NIIBE Yutaka <gn...@m1...>
* AGAINST-2.5.24: New file.
* AGAINST-2.5.24: Removed.
* Makefile: Version 2.5.24.
* arch/sh/kernel/sys_sh.c, drivers/Makefile, drivers/char/Makefile,
drivers/mtd/maps/Config.in, drivers/net/8139too.c,
drivers/net/Config.in, drivers/pcmcia/hd64465_ss.c: Incorporate
changes in 2.5.23.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.29
diff -u -3 -p -r1.29 Makefile
--- Makefile 26 Jun 2002 01:44:05 -0000 1.29
+++ Makefile 26 Jun 2002 01:53:17 -0000
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 23
+SUBLEVEL = 24
EXTRAVERSION =-sh
# We are using a recursive build, so we need to do a little thinking
@@ -48,11 +48,35 @@ ifndef KBUILD_VERBOSE
KBUILD_VERBOSE = 1
endif
-# Decide whether to build built-in, modular, or both
+# Decide whether to build built-in, modular, or both.
+# Normally, just do built-in.
-KBUILD_MODULES := 1
+KBUILD_MODULES :=
KBUILD_BUILTIN := 1
+# If we have only "make modules", don't compile built-in objects.
+
+ifeq ($(MAKECMDGOALS),modules)
+ KBUILD_BUILTIN :=
+endif
+
+# If we have "make <whatever> modules", compile modules
+# in addition to whatever we do anyway.
+
+ifneq ($(filter modules,$(MAKECMDGOALS)),)
+ KBUILD_MODULES := 1
+endif
+
+# Just "make" or "make all" shall build modules as well
+
+ifeq ($(MAKECMDGOALS),)
+ KBUILD_MODULES := 1
+endif
+
+ifneq ($(filter all,$(MAKECMDGOALS)),)
+ KBUILD_MODULES := 1
+endif
+
export KBUILD_MODULES KBUILD_BUILTIN
# Beautify output
@@ -120,6 +144,8 @@ export CPPFLAGS EXPORT_FLAGS NOSTDINC_FL
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
+SUBDIRS := init kernel mm fs ipc lib drivers sound net
+
noconfig_targets := xconfig menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig allmodconfig \
clean mrproper distclean \
@@ -182,7 +208,7 @@ endif
# Link components for vmlinux
# ---------------------------------------------------------------------------
-SUBDIRS := init kernel mm fs ipc lib drivers sound net
+
INIT := init/init.o
CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
LIBS := lib/lib.a
@@ -254,6 +280,7 @@ $(SUBDIRS): .hdepend prepare
.PHONY: prepare
prepare: include/linux/version.h include/asm include/config/MARKER
+ @echo ' Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
# Single targets
# ---------------------------------------------------------------------------
@@ -354,7 +381,7 @@ include/linux/modversions.h: scripts/fix
@( echo "#ifndef _LINUX_MODVERSIONS_H";\
echo "#define _LINUX_MODVERSIONS_H"; \
echo "#include <linux/modsetver.h>"; \
- for f in `cd .tmp_export-objs; find modules -name \*.ver -print | sort`; do \
+ for f in `cd .tmp_export-objs; find modules -name SCCS -prune -o -name BitKeeper -prune -o -name \*.ver -print | sort`; do \
echo "#include <linux/$${f}>"; \
done; \
echo "#endif"; \
@@ -384,8 +411,7 @@ MODFLAGS += -include $(HPATH)/linux/modv
endif
.PHONY: modules
-modules:
- @$(MAKE) KBUILD_BUILTIN= $(SUBDIRS)
+modules: $(SUBDIRS)
# Install modules
@@ -466,7 +492,9 @@ spec:
# will become invalid
rpm: clean spec
- find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
+ find . -name SCCS -prune -o -name BitKeeper -prune -o \
+ \( -size 0 -o -name .depend -o -name .hdepend \) \
+ -type f -print | xargs rm -f
set -e; \
cd $(TOPDIR)/.. ; \
ln -sf $(TOPDIR) $(KERNELPATH) ; \
@@ -549,6 +577,7 @@ CLEAN_FILES += \
drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
drivers/char/conmakehash \
drivers/char/drm/*-mod.c \
+ drivers/char/defkeymap.c drivers/char/qtronixmap.c \
drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
drivers/zorro/devlist.h drivers/zorro/gen-devlist \
sound/oss/bin2hex sound/oss/hex2hex \
@@ -559,9 +588,12 @@ CLEAN_FILES += \
drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
drivers/scsi/aic7xxx/aicasm/y.tab.h \
drivers/scsi/aic7xxx/aicasm/aicasm \
- drivers/scsi/53c700_d.h \
- net/khttpd/make_times_h \
- net/khttpd/times.h \
+ drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
+ drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
+ drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
+ net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
+ net/802/pseudo/pseudocode.h \
+ net/khttpd/make_times_h net/khttpd/times.h \
submenu*
# files removed with 'make mrproper'
@@ -599,23 +631,26 @@ include arch/$(ARCH)/Makefile
clean: archclean
@echo 'Cleaning up'
- @find . \( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
- -name .\*.tmp -o -name .\*.d \) -type f -print \
+ @find . -name SCCS -prune -o -name BitKeeper -prune -o \
+ \( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
+ -name .\*.tmp -o -name .\*.d \) -type f -print \
| grep -v lxdialog/ | xargs rm -f
@rm -f $(CLEAN_FILES)
@$(MAKE) -C Documentation/DocBook clean
mrproper: clean archmrproper
@echo 'Making mrproper'
- @find . \( -size 0 -o -name .depend -o -name .\*.cmd \) \
- -type f -print | xargs rm -f
+ @find . -name SCCS -prune -o -name BitKeeper -prune -o \
+ \( -name .depend -o -name .\*.cmd \) \
+ -type f -print | xargs rm -f
@rm -f $(MRPROPER_FILES)
@rm -rf $(MRPROPER_DIRS)
@$(MAKE) -C Documentation/DocBook mrproper
distclean: mrproper
@echo 'Making distclean'
- @find . \( -not -type d \) -and \
+ @find . -name SCCS -prune -o -name BitKeeper -prune -o \
+ \( -not -type d \) -and \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f \
@@ -625,16 +660,24 @@ distclean: mrproper
# ---------------------------------------------------------------------------
TAGS: FORCE
- { find include/asm-${ARCH} -name '*.h' -print ; \
- find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
- find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
+ { find include/asm-${ARCH} -name SCCS -prune -o -name BitKeeper -prune \
+ -o -name '*.h' -print ; \
+ find include -name SCCS -prune -o -name BitKeeper -prune -o \
+ -type d \( -name "asm-*" -o -name config \) -prune -o \
+ -name '*.h' -print ; \
+ find $(SUBDIRS) init arch/${ARCH} \
+ -name SCCS -prune -o -name BitKeeper -prune -o \
+ -name '*.[chS]' -print ; } | grep -v SCCS | etags -
# Exuberant ctags works better with -I
tags: FORCE
CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
- ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
- find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
- find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
+ ctags $$CTAGSF `find include/asm-$(ARCH) -name SCCS -prune -o -name BitKeeper -prune -o -name '*.h' -print` && \
+ find include -name SCCS -prune -o -name BitKeeper -prune -o \
+ -type d \( -name "asm-*" -o -name config \) -prune -o \
+ -name '*.h' -print | xargs ctags $$CTAGSF -a && \
+ find $(SUBDIRS) init -name SCCS -prune -o -name BitKeeper -prune -o \
+ -name '*.[ch]' -print | xargs ctags $$CTAGSF -a
# Documentation targets
# ---------------------------------------------------------------------------
@@ -647,13 +690,19 @@ sgmldocs psdocs pdfdocs htmldocs:
# ---------------------------------------------------------------------------
checkconfig:
- find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
+ find * -name SCCS -prune -o -name BitKeeper -prune -o \
+ -name '*.[hcS]' -type f -print | sort \
+ | xargs $(PERL) -w scripts/checkconfig.pl
checkhelp:
- find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl
+ find * -name SCCS -prune -o -name BitKeeper -prune -o \
+ -name [cC]onfig.in -print | sort \
+ | xargs $(PERL) -w scripts/checkhelp.pl
checkincludes:
- find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
+ find * -name SCCS -prune -o -name BitKeeper -prune -o \
+ -name '*.[hcS]' -type f -print | sort \
+ | xargs $(PERL) -w scripts/checkincludes.pl
else # ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
Index: arch/sh/kernel/sys_sh.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/sys_sh.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 sys_sh.c
--- arch/sh/kernel/sys_sh.c 15 Oct 2001 20:44:53 -0000 1.1
+++ arch/sh/kernel/sys_sh.c 26 Jun 2002 01:53:17 -0000
@@ -231,10 +231,3 @@ asmlinkage int sys_uname(struct old_utsn
up_read(&uts_sem);
return err?-EFAULT:0;
}
-
-asmlinkage int sys_pause(void)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule();
- return -ERESTARTNOHAND;
-}
Index: drivers/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/Makefile,v
retrieving revision 1.10
diff -u -3 -p -r1.10 Makefile
--- drivers/Makefile 18 Jun 2002 04:05:00 -0000 1.10
+++ drivers/Makefile 26 Jun 2002 01:53:17 -0000
@@ -40,7 +40,7 @@ obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_MD) += md/
obj-$(CONFIG_BLUEZ) += bluetooth/
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
-obj-$(CONFIG_ISDN) += isdn/
+obj-$(CONFIG_ISDN_BOOL) += isdn/
obu-$(CONFIG_MAPLE) += maple/
include $(TOPDIR)/Rules.make
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.12
diff -u -3 -p -r1.12 Makefile
--- drivers/char/Makefile 18 Jun 2002 04:05:00 -0000 1.12
+++ drivers/char/Makefile 26 Jun 2002 01:53:17 -0000
@@ -219,13 +219,11 @@ host-progs := conmakehash
include $(TOPDIR)/Rules.make
-consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
- ./conmakehash $< > $@
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
+ $(obj)/conmakehash $< > $@
-.DELETE_ON_ERROR:
-
-defkeymap.c: defkeymap.map
+$(obj)/defkeymap.c: $(src)/defkeymap.map
set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
-qtronixmap.c: qtronixmap.map
+$(obj)/qtronixmap.c: $(src)/qtronixmap.map
set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
Index: drivers/mtd/maps/Config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/mtd/maps/Config.in,v
retrieving revision 1.2
diff -u -3 -p -r1.2 Config.in
--- drivers/mtd/maps/Config.in 8 Nov 2001 20:24:41 -0000 1.2
+++ drivers/mtd/maps/Config.in 26 Jun 2002 01:53:17 -0000
@@ -14,7 +14,7 @@ if [ "$CONFIG_MTD_PHYSMAP" = "y" -o "$CO
int ' Bus width in octets' CONFIG_MTD_PHYSMAP_BUSWIDTH 2
fi
-if [ "$CONFIG_SPARC" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
+if [ "$CONFIG_SPARC32" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
dep_tristate ' Sun Microsystems userflash support' CONFIG_MTD_SUN_UFLASH $CONFIG_MTD_CFI
fi
@@ -27,7 +27,7 @@ if [ "$CONFIG_X86" = "y" ]; then
dep_tristate ' JEDEC Flash device mapped on Mixcom piggyback card' CONFIG_MTD_MIXMEM $CONFIG_MTD_JEDEC
dep_tristate ' JEDEC Flash device mapped on Octagon 5066 SBC' CONFIG_MTD_OCTAGON $CONFIG_MTD_JEDEC
dep_tristate ' JEDEC Flash device mapped on Tempustech VMAX SBC301' CONFIG_MTD_VMAX $CONFIG_MTD_JEDEC
- dep_tristate ' BIOS flash chip on Intel L440GX boards' CONFIG_MTD_L440GX $CONFIG_I386 $CONFIG_MTD_JEDEC
+ dep_tristate ' BIOS flash chip on Intel L440GX boards' CONFIG_MTD_L440GX $CONFIG_X86 $CONFIG_MTD_JEDEC
fi
if [ "$CONFIG_PPC" = "y" ]; then
Index: drivers/net/8139too.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/8139too.c,v
retrieving revision 1.12
diff -u -3 -p -r1.12 8139too.c
--- drivers/net/8139too.c 23 May 2002 01:51:13 -0000 1.12
+++ drivers/net/8139too.c 26 Jun 2002 01:53:17 -0000
@@ -3,7 +3,7 @@
8139too.c: A RealTek RTL-8139 Fast Ethernet driver for Linux.
Maintained by Jeff Garzik <jg...@ma...>
- Copyright 2000,2001 Jeff Garzik
+ Copyright 2000-2002 Jeff Garzik
Much code comes from Donald Becker's rtl8139.c driver,
versions 1.13 and older. This driver was originally based
@@ -92,7 +92,7 @@
*/
#define DRV_NAME "8139too"
-#define DRV_VERSION "0.9.24"
+#define DRV_VERSION "0.9.25"
#include <linux/config.h>
@@ -212,6 +212,8 @@ enum {
HAS_LNK_CHNG = 0x040000,
};
+#define RTL_NUM_STATS 4 /* number of ETHTOOL_GSTATS u64's */
+#define RTL_REGS_VER 1 /* version of reg. data in ETHTOOL_GREGS */
#define RTL_MIN_IO_SIZE 0x80
#define RTL8139B_IO_SIZE 256
@@ -283,6 +285,14 @@ static struct pci_device_id rtl8139_pci_
};
MODULE_DEVICE_TABLE (pci, rtl8139_pci_tbl);
+static struct {
+ const char str[ETH_GSTRING_LEN];
+} ethtool_stats_keys[] = {
+ { "early_rx" },
+ { "tx_buf_mapped" },
+ { "tx_timeouts" },
+ { "rx_lost_in_ring" },
+};
/* The rest of these values should never change. */
@@ -580,6 +590,7 @@ struct rtl8139_private {
struct rtl_extra_stats xstats;
int time_to_die;
struct mii_if_info mii;
+ unsigned int regs_len;
};
MODULE_AUTHOR ("Jeff Garzik <jg...@ma...>");
@@ -828,6 +839,7 @@ static int __devinit rtl8139_init_board
ioaddr = (void *) pio_start;
dev->base_addr = pio_start;
tp->mmio_addr = ioaddr;
+ tp->regs_len = pio_len;
#else
/* ioremap MMIO region */
ioaddr = ioremap (mmio_start, mmio_len);
@@ -838,6 +850,7 @@ static int __devinit rtl8139_init_board
}
dev->base_addr = (long) ioaddr;
tp->mmio_addr = ioaddr;
+ tp->regs_len = mmio_len;
#endif /* USE_IO_OPS */
/* Bring old chips out of low-power mode. */
@@ -1029,6 +1042,7 @@ static int __devinit rtl8139_init_one (s
} else
#endif
tp->phys[0] = 32;
+ tp->mii.phy_id = tp->phys[0];
/* The lower four bits are the media type. */
option = (board_idx >= MAX_UNITS) ? 0 : media[board_idx];
@@ -2252,6 +2266,7 @@ static int netdev_ethtool_ioctl (struct
strcpy (info.driver, DRV_NAME);
strcpy (info.version, DRV_VERSION);
strcpy (info.bus_info, np->pci_dev->slot_name);
+ info.regdump_len = np->regs_len;
if (copy_to_user (useraddr, &info, sizeof (info)))
return -EFAULT;
return 0;
@@ -2331,6 +2346,104 @@ static int netdev_ethtool_ioctl (struct
return rc;
}
+/* TODO: we are too slack to do reg dumping for pio, for now */
+#ifndef CONFIG_8139TOO_PIO
+ /* NIC register dump */
+ case ETHTOOL_GREGS: {
+ struct ethtool_regs regs;
+ unsigned int regs_len = np->regs_len;
+ u8 *regbuf = kmalloc(regs_len, GFP_KERNEL);
+ int rc;
+
+ if (!regbuf)
+ return -ENOMEM;
+ memset(regbuf, 0, regs_len);
+
+ rc = copy_from_user(®s, useraddr, sizeof(regs));
+ if (rc) {
+ rc = -EFAULT;
+ goto err_out_gregs;
+ }
+
+ if (regs.len > regs_len)
+ regs.len = regs_len;
+ if (regs.len < regs_len) {
+ rc = -EINVAL;
+ goto err_out_gregs;
+ }
+
+ regs.version = RTL_REGS_VER;
+ rc = copy_to_user(useraddr, ®s, sizeof(regs));
+ if (rc) {
+ rc = -EFAULT;
+ goto err_out_gregs;
+ }
+
+ useraddr += offsetof(struct ethtool_regs, data);
+
+ spin_lock_irq(&np->lock);
+ memcpy_fromio(regbuf, np->mmio_addr, regs_len);
+ spin_unlock_irq(&np->lock);
+
+ if (copy_to_user(useraddr, regbuf, regs_len))
+ rc = -EFAULT;
+
+err_out_gregs:
+ kfree(regbuf);
+ return rc;
+ }
+#endif /* CONFIG_8139TOO_PIO */
+
+ /* get string list(s) */
+ case ETHTOOL_GSTRINGS: {
+ struct ethtool_gstrings estr = { ETHTOOL_GSTRINGS };
+
+ if (copy_from_user(&estr, useraddr, sizeof(estr)))
+ return -EFAULT;
+ if (estr.string_set != ETH_SS_STATS)
+ return -EINVAL;
+
+ estr.len = RTL_NUM_STATS;
+ if (copy_to_user(useraddr, &estr, sizeof(estr)))
+ return -EFAULT;
+ if (copy_to_user(useraddr + sizeof(estr),
+ ðtool_stats_keys,
+ sizeof(ethtool_stats_keys)))
+ return -EFAULT;
+ return 0;
+ }
+
+ /* get NIC-specific statistics */
+ case ETHTOOL_GSTATS: {
+ struct ethtool_stats estats = { ETHTOOL_GSTATS };
+ u64 *tmp_stats;
+ const unsigned int sz = sizeof(u64) * RTL_NUM_STATS;
+ int i;
+
+ estats.n_stats = RTL_NUM_STATS;
+ if (copy_to_user(useraddr, &estats, sizeof(estats)))
+ return -EFAULT;
+
+ tmp_stats = kmalloc(sz, GFP_KERNEL);
+ if (!tmp_stats)
+ return -ENOMEM;
+ memset(tmp_stats, 0, sz);
+
+ i = 0;
+ tmp_stats[i++] = np->xstats.early_rx;
+ tmp_stats[i++] = np->xstats.tx_buf_mapped;
+ tmp_stats[i++] = np->xstats.tx_timeouts;
+ tmp_stats[i++] = np->xstats.rx_lost_in_ring;
+ if (i != RTL_NUM_STATS)
+ BUG();
+
+ i = copy_to_user(useraddr + sizeof(estats), tmp_stats, sz);
+ kfree(tmp_stats);
+
+ if (i)
+ return -EFAULT;
+ return 0;
+ }
default:
break;
}
@@ -2449,7 +2562,7 @@ static void __set_rx_mode (struct net_de
i++, mclist = mclist->next) {
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
- mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31));
+ mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
rx_mode |= AcceptMulticast;
}
}
Index: drivers/net/Config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/Config.in,v
retrieving revision 1.9
diff -u -3 -p -r1.9 Config.in
--- drivers/net/Config.in 6 May 2002 00:50:02 -0000 1.9
+++ drivers/net/Config.in 26 Jun 2002 01:53:17 -0000
@@ -124,7 +124,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
tristate ' EtherExpress 16 support' CONFIG_EEXPRESS
tristate ' EtherExpressPro support/EtherExpress 10 (i82595) support' CONFIG_EEXPRESS_PRO
if [ "$CONFIG_OBSOLETE" = "y" ]; then
- tristate ' FMV-181/182/183/184 support' CONFIG_FMV18X
+ tristate ' FMV-181/182/183/184 support (OBSOLETE)' CONFIG_FMV18X
fi
tristate ' HP PCLAN+ (27247B and 27252A) support' CONFIG_HPLAN_PLUS
tristate ' HP PCLAN (27245 and other 27xxx series) support' CONFIG_HPLAN
@@ -135,7 +135,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
dep_tristate ' SEEQ8005 support (EXPERIMENTAL)' CONFIG_SEEQ8005 $CONFIG_EXPERIMENTAL
fi
if [ "$CONFIG_OBSOLETE" = "y" ]; then
- tristate ' SK_G16 support' CONFIG_SK_G16
+ tristate ' SK_G16 support (OBSOLETE)' CONFIG_SK_G16
fi
tristate ' CS89x0 support' CONFIG_CS89x0
fi
@@ -187,7 +187,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
dep_tristate ' VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
dep_mbool ' Use MMIO instead of PIO (EXPERIMENTAL)' CONFIG_VIA_RHINE_MMIO $CONFIG_VIA_RHINE $CONFIG_EXPERIMENTAL
if [ "$CONFIG_OBSOLETE" = "y" ]; then
- dep_bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET $CONFIG_ISA
+ dep_bool ' Zenith Z-Note support (OBSOLETE)' CONFIG_ZNET $CONFIG_ISA
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_MIPS" = "y" ]; then
bool ' Philips SAA9730 Ethernet support (EXPERIMENTAL)' CONFIG_LAN_SAA9730
@@ -252,9 +252,9 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; the
if [ "$CONFIG_INET" = "y" ]; then
bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI
if [ "$CONFIG_HIPPI" = "y" -a "$CONFIG_PCI" = "y" ]; then
- dep_tristate ' Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER $CONFIG_PCI
+ dep_tristate ' Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)' CONFIG_ROADRUNNER $CONFIG_PCI
if [ "$CONFIG_ROADRUNNER" != "n" ]; then
- bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
+ bool ' Use large TX/RX rings (EXPERIMENTAL)' CONFIG_ROADRUNNER_LARGE_RINGS
fi
fi
fi
Index: drivers/pcmcia/hd64465_ss.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pcmcia/hd64465_ss.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 hd64465_ss.c
--- drivers/pcmcia/hd64465_ss.c 24 Jan 2002 11:04:15 -0000 1.2
+++ drivers/pcmcia/hd64465_ss.c 26 Jun 2002 01:53:17 -0000
@@ -37,6 +37,7 @@
#include <linux/vmalloc.h>
#include <asm/errno.h>
#include <linux/irq.h>
+#include <linux/tqueue.h>
#include <asm/io.h>
#include <asm/hd64465.h>
|
