Skip to content

GitLab

Commit 44e8778c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

v2.4.2.1 -> v2.4.2.2 

  - Jens Axboe: fix loop device deadlocks
  - Greg KH: USB updates
  - Alan Cox: continued merging
  - Tim Waugh: parport and documentation updates
  - Cort Dougan: PowerPC merge
  - Jeff Garzik: network driver updates
  - Justin Gibbs: new and much improved aic7xxx driver 6.1.5
parent c37b3aca
Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 85 deletions
CREDITS
View file @ 44e8778c
......@@ -679,12 +679,8 @@ S: Belgium
N: Cort Dougan
E: cort@fsmlabs.com
W: http://www.ppc.kernel.org/~cort/
W: http://www.fsmlabs.com/linuxppcbk.html
D: PowerPC
S: Finite State Machine Labs
S: P.O. 1829
S: Socorro, New Mexico 87801
S: USA
N: Oleg Drokin
E: green@ccssu.crimea.ua
......@@ -1026,11 +1022,11 @@ S: Toronto, Ontario, M4Y 2W4
S: Canada
N: Richard Gnther
E: richard.guenther@student.uni-tuebingen.de
E: rguenth@tat.physik.uni-tuebingen.de
W: http://www.tat.physik.uni-tuebingen.de/~rguenth
P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57
D: binfmt_misc
S: Fichtenweg 3/511
S: 72076 Tbingen
S: 72074 Tbingen
S: Germany
N: Justin Guyett
......@@ -1347,9 +1343,7 @@ S: USA
N: Dave Jones
E: davej@suse.de
E: dave@powertweak.com
E: djones2@glam.ac.uk
W: http://powertweak.sourceforge.net
W: http://www.suse.de/~davej
D: Moved PCI bridge tuning to userspace (Powertweak).
D: Centaur/IDT Winchip/Winchip 2 tweaks.
D: AFFS fixes for 2.3.x
......@@ -2191,15 +2185,15 @@ S: Harrison, Arkansas 72602-1815
S: USA
N: Kai Petzke
E: wpp@marie.physik.tu-berlin.de
W: http://physik.tu-berlin.de/~wpp
P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38 2E 3E 31 79 C3 65 5D E1
E: petzke@teltarif.de
W: http://www.teltarif.de/
P: 1024/B42868C1 D9 59 B9 98 BB 93 05 38 2E 3E 31 79 C3 65 5D E1
D: Driver for Laser Magnetic Storage CD-ROM
D: Some kernel bug fixes
D: Port of the database Postgres
D: "Unix fuer Jedermann" a German introduction to linux (see my web page)
S: M"ullerstr. 69
S: 13349 Berlin
D: Book: "Linux verstehen und anwenden" (Hanser-Verlag)
S: Triftstra=DFe 55
S: 13353 Berlin
S: Germany
N: Emanuel Pirker
......
Documentation/Configure.help
View file @ 44e8778c
......@@ -5469,6 +5469,45 @@ CONFIG_SCSI_AHA1740
 
Adaptec AIC7xxx chipset SCSI controller support
CONFIG_SCSI_AIC7XXX
This driver supports all of Adaptec's PCI based SCSI controllers (not
the hardware RAID controllers though) as well as the aic7770 based
EISA and VLB SCSI controllers (the 274x and 284x series). This is
an Adaptec sponsored driver written by Justin Gibbs. It is intended
to replace the previous aic7xxx driver maintained by Doug Ledford since
Doug is no longer maintaining that driver.
Default number of TCQ commands per device
CONFIG_AIC7XXX_CMDS_PER_DEVICE
Specify the number of commands you would like to allocate per SCSI
device when Tagged Command Queueing (TCQ) is enabled on that device.
This is an upper bound value for the number of tagged transactions
to be used for any device. The aic7xxx driver will automatically
vary this number based on device behavior. For devices with a
fixed maximum, the driver will eventually lock to this maximum
and display a console message inidicating this value.
Note: Unless you experience some type of device failure, the default
value, no enforced limit, should work for you.
Default: 253
Initial Bus Reset Settle Delay
CONFIG_AIC7XXX_RESET_DELAY
The number of milliseconds to delay after an initial bus reset.
The bus settle delay following all error recovery actions is
dictated by the SCSI layer and is not affected by this value.
Default: 5000 (5 seconds)
Old Adaptec AIC7xxx chipset SCSI controller support
CONFIG_SCSI_AIC7XXX_OLD
WARNING This driver is an older aic7xxx driver and is no longer under
active development. Adaptec, Inc. is writing a new driver to take the
place of this one, and it is recommended that whenever possible, people
should use the new Adaptec written driver instead of this one. This
driver will eventually be phased out entirely.
This is support for the various aic7xxx based Adaptec SCSI
controllers. These include the 274x EISA cards; 284x VLB cards;
2902, 2910, 293x, 294x, 394x, 3985 and several other PCI and
......@@ -5490,7 +5529,7 @@ CONFIG_SCSI_AIC7XXX
 
Information on the configuration options for this controller can be
found by checking the help file for each of the available
configuration options. You should read drivers/scsi/README.aic7xxx
configuration options. You should read drivers/scsi/aic7xxx_old/README.aic7xxx
at a minimum before contacting the maintainer with any questions.
The SCSI-HOWTO, available from
http://www.linuxdoc.org/docs.html#howto , can also be of great
......@@ -5499,10 +5538,10 @@ CONFIG_SCSI_AIC7XXX
If you want to compile this driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
say M here and read Documentation/modules.txt. The module will be
called aic7xxx.o.
called aic7xxx_old.o.
 
Enable or Disable Tagged Command Queueing by default
CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT
CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT
This option causes the aic7xxx driver to attempt to use Tagged
Command Queueing (TCQ) on all devices that claim to support it.
 
......@@ -5536,7 +5575,7 @@ CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT
reduce performance.
 
Default number of TCQ commands per device
CONFIG_AIC7XXX_CMDS_PER_DEVICE
CONFIG_AIC7XXX_OLD_CMDS_PER_DEVICE
Specify the number of commands you would like to allocate per SCSI
device when Tagged Command Queueing (TCQ) is enabled on that device.
 
......@@ -5557,7 +5596,7 @@ CONFIG_AIC7XXX_CMDS_PER_DEVICE
Default: 8
 
Collect statistics to report in /proc
CONFIG_AIC7XXX_PROC_STATS
CONFIG_AIC7XXX_OLD_PROC_STATS
This option tells the driver to keep track of how many commands have
been sent to each particular device and report that information to
the user via the /proc/scsi/aic7xxx/n file, where n is the number of
......@@ -5569,21 +5608,6 @@ CONFIG_AIC7XXX_PROC_STATS
 
If unsure, say N.
 
Delay in seconds after SCSI bus reset
CONFIG_AIC7XXX_RESET_DELAY
This sets how long the driver will wait after resetting the SCSI bus
before attempting to communicate with the devices on the SCSI bus
again. This delay will be used during the reset phase at bootup time
as well as after any reset that might occur during normal operation.
Reasonable numbers range anywhere from 5 to 15 seconds depending on
your devices. DAT tape drives are notorious for needing more time
after a bus reset to be ready for the next command, but most hard
drives and CD-ROM devices are ready in only a few seconds. This
option has a maximum upper limit of 20 seconds to avoid bad
interactions between the aic7xxx driver and the rest of the Linux
kernel. The default value has been reduced to 5 seconds. If this
doesn't work with your hardware, try increasing this value.
IBM ServeRAID Support
CONFIG_SCSI_IPS
This is support for the IBM ServeRAID hardware RAID controllers.
......@@ -8390,22 +8414,6 @@ CONFIG_NI65
module, say M here and read Documentation/modules.txt as well as
Documentation/networking/net-modules.txt.
 
RealTek 8129 (not 8019/8029/8139!) support (EXPERIMENTAL)
CONFIG_RTL8129
This is NOT for RTL-8139 cards. Instead, select the 8139too driver
(CONFIG_8139TOO).
This is a driver for the Fast Ethernet PCI network cards based on
the RTL8129 chip. If you have one of those, say Y and
read the Ethernet-HOWTO, available from
http://www.linuxdoc.org/docs.html#howto .
Note: the 8029 is a NE2000 PCI clone, you can use the NE2K-PCI driver.
If you want to compile this driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
say M here and read Documentation/modules.txt. This is recommended.
The module will be called rtl8129.o.
RealTek RTL-8139 PCI Fast Ethernet Adapter support
CONFIG_8139TOO
This is a driver for the Fast Ethernet PCI network cards based on
......@@ -8481,7 +8489,7 @@ CONFIG_ADAPTEC_STARFIRE
If you want to compile this driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
say M here and read Documentation/modules.txt. This is recommended.
The module will be called starfile.o.
The module will be called starfire.o.
Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
CONFIG_ACENIC
......@@ -9399,7 +9407,7 @@ CONFIG_IBMOL
 
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will will be called olympic.o. If you want to compile it
The module will be called olympic.o. If you want to compile it
as a module, say M here and read Documentation/modules.txt.
 
Also read the file Documentation/networking/olympic.txt or check the
......@@ -9439,7 +9447,7 @@ CONFIG_TMS380TR
 
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will will be called tms380tr.o. If you want to compile it
The module will be called tms380tr.o. If you want to compile it
as a module, say M here and read Documentation/modules.txt.
 
Generic TMS380 PCI support
......@@ -9454,7 +9462,7 @@ CONFIG_TMSPCI
 
This driver is available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will will be called tmspci.o. If you want to compile it
The module will be called tmspci.o. If you want to compile it
as a module, say M here and read Documentation/modules.txt.
 
Madge Smart 16/4 PCI Mk2 support
......@@ -9464,7 +9472,7 @@ CONFIG_ABYSS
 
This driver is available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will will be called abyss.o. If you want to compile it
The module will be called abyss.o. If you want to compile it
as a module, say M here and read Documentation/modules.txt.
 
Madge Smart 16/4 Ringode MicroChannel
......@@ -9474,7 +9482,7 @@ CONFIG_MADGEMC
 
This driver is available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will will be called madgemc.o. If you want to compile it
The module will be called madgemc.o. If you want to compile it
as a module, say M here and read Documentation/modules.txt.
 
SMC ISA TokenRing adapter support
......@@ -9490,7 +9498,7 @@ CONFIG_SMCTR
 
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will will be called smctr.o. If you want to compile it
The module will be called smctr.o. If you want to compile it
as a module, say M here and read Documentation/modules.txt.
 
Sun Happy Meal 10/100baseT support
......
Documentation/DMA-mapping.txt
View file @ 44e8778c
......@@ -59,7 +59,7 @@ In the failure case, you have two options:
1) Use some non-DMA mode for data transfer, if possible.
2) Ignore this device and do not initialize it.
It is recommended that your driver print a kernel KERN_WARN message
It is recommended that your driver print a kernel KERN_WARNING message
when you do one of these two things. In this manner, if a user of
your driver reports that performance is bad or that the device is not
even detected, you can ask him for the kernel messages to find out
......
Documentation/DocBook/kernel-api.tmpl
View file @ 44e8778c
......@@ -34,6 +34,18 @@
</bookinfo>
<toc></toc>
<chapter id="Basics">
<title>Driver Basic</title>
<sect1><title>Driver Entry and Exit points</title>
!Iinclude/linux/init.h
</sect1>
<sect1><title>Atomics</title>
!Iinclude/asm-i386/atomic.h
</sect1>
</chapter>
<chapter id="adt">
<title>Data Types</title>
<sect1><title>Doubly Linked Lists</title>
......
Documentation/binfmt_misc.txt
View file @ 44e8778c
......@@ -81,6 +81,6 @@ unexpected behaviour and be a security hazard.
There is a web page about binfmt_misc at
http://www.anatom.uni-tuebingen.de/~richi/linux/binfmt_misc.html
http://www.tat.physik.uni-tuebingen.de/~rguenth/linux/binfmt_misc.html
Richard Günther, richard.guenther@student.uni-tuebingen.de
Richard Günther <rguenth@tat.physik.uni-tuebingen.de>
Documentation/dnotify.txt
View file @ 44e8778c
......@@ -28,7 +28,7 @@ By default, SIGIO will be delivered to the process and no other useful
information. However, if the F_SETSIG fcntl(2) call is used to let the
kernel know which signal to deliver, a siginfo structure will be passed to
the signal handler and the si_fd member of that structure will contain the
file descriptor associated with the direcory in which the event occured.
file descriptor associated with the directory in which the event occurred.
Preferably the application will choose one of the real time signals
(SIGRTMIN + <n>) so that the notifications may be queued. This is
......
Documentation/ioctl-number.txt
View file @ 44e8778c
......@@ -92,6 +92,7 @@ Code Seq# Include File Comments
<http://linux01.gwdg.de/~alatham/ppdd.html>
'M' all linux/soundcard.h conflict!
'M' 00-1F linux/isicom.h conflict!
'N' 00-1F drivers/usb/scanner.h
'P' all linux/soundcard.h
'Q' all linux/soundcard.h
'R' 00-1F linux/random.h
......
Documentation/isdn/INTERFACE
View file @ 44e8778c
......@@ -481,7 +481,7 @@ Description of the Interface between Linklevel and Hardwarelevel
driver = driver-Id
command = ISDN_CMD_PROT_IO
arg = The lower 8 Bits define the addressed protocol as defined
in ISDN_PTYPE..., the upper bits are used to differenciate
in ISDN_PTYPE..., the upper bits are used to differentiate
the protocol specific CMD.
para = protocol and function specific. See isdnif.h for detail.
......
Documentation/kernel-doc-nano-HOWTO.txt
View file @ 44e8778c
......@@ -57,7 +57,8 @@ format of your choice (for example, 'db2html ...').
If you want to see man pages instead, you can do this:
$ cd linux
$ scripts/kernel-doc -man $(find -name '*.c' '*.h') | split-man.pl /tmp/man
$ scripts/kernel-doc -man $(find -name '*.c') | split-man.pl /tmp/man
$ scripts/kernel-doc -man $(find -name '*.h') | split-man.pl /tmp/man
Here is split-man.pl:
......@@ -68,7 +69,7 @@ if ($#ARGV < 0) {
die "where do I put the results?\n";
}
mkdir $ARGV[0],0777 or die "Can't create $ARGV[0]: $!\n";
mkdir $ARGV[0],0777;
$state = 0;
while (<STDIN>) {
if (/^\.TH \"[^\"]*\" 4 \"([^\"]*)\"/) {
......
Documentation/powerpc/ppc_htab.txt
View file @ 44e8778c
......@@ -2,7 +2,7 @@
=====================================================================
This document and the related code was written by me (Cort Dougan), please
email me (cort@cs.nmt.edu) if you have questions, comments or corrections.
email me (cort@fsmlabs.com) if you have questions, comments or corrections.
Last Change: 2.16.98
......
Documentation/powerpc/smp.txt
View file @ 44e8778c
......@@ -2,7 +2,7 @@
=====================================================================
This document and the related code was written by me
(Cort Dougan, cort@cs.nmt.edu) please email me if you have questions,
(Cort Dougan, cort@fsmlabs.com) please email me if you have questions,
comments or corrections.
Last Change: 3.31.99
......
Documentation/powerpc/sound.txt
View file @ 44e8778c
Information about PowerPC Sound support
=====================================================================
Please mail me (Cort Dougan, cort@cs.nmt.edu) if you have questions,
Please mail me (Cort Dougan, cort@fsmlabs.com) if you have questions,
comments or corrections.
Last Change: 6.16.99
......
Documentation/powerpc/zImage_layout.txt
View file @ 44e8778c
Information about the Linux/PPC kernel images
=====================================================================
Please mail me me (Cort Dougan, cort@cs.nmt.edu) if you have questions,
Please mail me (Cort Dougan, cort@fsmlabs.com) if you have questions,
comments or corrections.
This document is meant to answer several questions I've had about how
......
MAINTAINERS
View file @ 44e8778c
......@@ -745,7 +745,7 @@ S: Maintained
LINUX FOR POWERPC
P: Cort Dougan
M: cort@fsmlabs.com
W: http://www.ppc.kernel.org/
W: http://www.fsmlabs.com/linuxppcbk.html
S: Maintained
LINUX FOR POWER MACINTOSH
......
Makefile
View file @ 44e8778c
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 3
EXTRAVERSION =-pre1
EXTRAVERSION =-pre2
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......@@ -144,6 +144,7 @@ DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
DRIVERS-$(CONFIG_SCSI_AIC7XXX) += drivers/scsi/aic7xxx/aic7xxx_drv.o
DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
......@@ -440,8 +441,8 @@ sums:
find . -type f -print | sort | xargs sum > .SUMS
dep-files: scripts/mkdep archdep include/linux/version.h
scripts/mkdep init/*.c > .depend
scripts/mkdep `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
scripts/mkdep -- init/*.c > .depend
scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
ifdef CONFIG_MODVERSIONS
$(MAKE) update-modverfile
......
Rules.make
View file @ 44e8778c
......@@ -123,7 +123,7 @@ endif
# This make dependencies quickly
#
fastdep: dummy
$(TOPDIR)/scripts/mkdep $(wildcard *.[chS] local.h.master) > .depend
$(TOPDIR)/scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS) -- $(wildcard *.[chS]) > .depend
ifdef ALL_SUB_DIRS
$(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)"
endif
......@@ -150,7 +150,7 @@ endif
#
ALL_MOBJS = $(filter-out $(obj-y), $(obj-m))
ifneq "$(strip $(ALL_MOBJS))" ""
PDWN=$(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
MOD_DESTDIR ?= $(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
endif
unexport MOD_DIRS
......@@ -172,8 +172,8 @@ modules: $(ALL_MOBJS) dummy \
.PHONY: _modinst__
_modinst__: dummy
ifneq "$(strip $(ALL_MOBJS))" ""
mkdir -p $(MODLIB)/kernel/$(PDWN)
cp $(ALL_MOBJS) $(MODLIB)/kernel/$(PDWN)
mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR)
cp $(ALL_MOBJS) $(MODLIB)/kernel/$(MOD_DESTDIR)$(MOD_TARGET)
endif
.PHONY: modules_install
......@@ -222,9 +222,9 @@ endif
$(MODINCL)/%.ver: %.c
@if [ ! -r $(MODINCL)/$*.stamp -o $(MODINCL)/$*.stamp -ot $< ]; then \
echo '$(CC) $(CFLAGS) -E -D__GENKSYMS__ $<'; \
echo '$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \
echo '| $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp'; \
$(CC) $(CFLAGS) -E -D__GENKSYMS__ $< \
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< \
| $(GENKSYMS) $(genksyms_smp_prefix) -k $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) > $@.tmp; \
if [ -r $@ ] && cmp -s $@ $@.tmp; then echo $@ is unchanged; rm -f $@.tmp; \
else echo mv $@.tmp $@; mv -f $@.tmp $@; fi; \
......
arch/alpha/defconfig
View file @ 44e8778c
......@@ -285,10 +285,8 @@ CONFIG_SR_EXTRA_DEVS=2
# CONFIG_SCSI_AHA1542 is not set
# CONFIG_SCSI_AHA1740 is not set
CONFIG_SCSI_AIC7XXX=y
CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT=y
CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
CONFIG_AIC7XXX_PROC_STATS=y
CONFIG_AIC7XXX_RESET_DELAY=5
CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
CONFIG_AIC7XXX_RESET_DELAY=5000
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_IN2000 is not set
# CONFIG_SCSI_AM53C974 is not set
......
arch/arm/mach-integrator/Makefile 0 → 100644
View file @ 44e8778c
#
# Makefile for the linux kernel.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
USE_STANDARD_AS_RULE := true
O_TARGET := integrator.o
# Object file lists.
obj-y := arch.o irq.o mm.o time.o
obj-m :=
obj-n :=
obj- :=
export-objs := leds.o
obj-$(CONFIG_LEDS) += leds.o
obj-$(CONFIG_PCI) += pci_v3.o pci.o
include $(TOPDIR)/Rules.make
arch/arm/mach-integrator/arch.c 0 → 100644
View file @ 44e8778c
/*
* linux/arch/arm/mach-integrator/arch.c
*
* Copyright (C) 2000 Deep Blue Solutions Ltd
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <asm/hardware.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/amba_kmi.h>
extern void integrator_map_io(void);
extern void integrator_init_irq(void);
#ifdef CONFIG_KMI_KEYB
static struct kmi_info integrator_keyboard __initdata = {
base: IO_ADDRESS(KMI0_BASE),
irq: IRQ_KMIINT0,
divisor: 24 / 8 - 1,
type: KMI_KEYBOARD,
};
static struct kmi_info integrator_mouse __initdata = {
base: IO_ADDRESS(KMI1_BASE),
irq: IRQ_KMIINT1,
divisor: 24 / 8 - 1,
type: KMI_MOUSE,
};
#endif
static void __init
integrator_fixup(struct machine_desc *desc, struct param_struct *params,
char **cmdline, struct meminfo *mi)
{
#ifdef CONFIG_KMI_KEYB
register_kmi(&integrator_keyboard);
register_kmi(&integrator_mouse);
#endif
}
MACHINE_START(INTEGRATOR, "ARM-Integrator")
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
BOOT_PARAMS(0x00000100)
FIXUP(integrator_fixup)
MAPIO(integrator_map_io)
INITIRQ(integrator_init_irq)
MACHINE_END
arch/arm/mach-integrator/dma.c 0 → 100644
View file @ 44e8778c
/*
* linux/arch/arm/mach-integrator/dma.c
*
* Copyright (C) 1999 ARM Limited
* Copyright (C) 2000 Deep Blue Solutions Ltd
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/sched.h>
#include <linux/malloc.h>
#include <linux/mman.h>
#include <linux/init.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/mach/dma.h>
void __init arch_dma_init(dma_t *dma)
{
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7