aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-11-17[PATCH] USB: wacom tablet driver updatePing Cheng
This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. and report Device IDs. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17[PATCH] USB: add new wacom devices to usb hid-core listPing Cheng
This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17[PATCH] USB Serial: rename ChangeLog.oldGreg Kroah-Hartman
People are complaining about a .old file in the tree. So rename drivers/usb/serial/ChangeLog.old to ChangeLog.history. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17[PATCH] USB: fix build breakage in dummy_hcd.cGreg Kroah-Hartman
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17[PATCH] Fix IXP4xx I2C driver build breakageDeepak Saxena
Platform device conversion missed a couple of spots. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds
2005-11-17x86: Fix silly typo in recent <asm/signal.h> fixesLinus Torvalds
The second __const_sigaddset() should have been a sigdelset.. Compile trouble noted by Greg K-H. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds
2005-11-17Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
2005-11-17Merge branch 'upstream-fixes' of ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
2005-11-17[PATCH] x86: fix sigaddset() inline asm memory constraintConstantine Gavrilov
Due to incomplete memory constraints, gcc would miscompile code with sigaddset on i386 if sig arg was const. A quote form Jakub to make the issue clear: "You need either __asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc"); or __asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc"); because the btsl instruction doesn't just set the memory to some value, but needs to read its previous content as well. If you don't tell that fact to GCC, GCC is of course free to optimize as if the asm was just setting the value and not depended on the previous value." Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17[PATCH] ipw2200: fix error log offset calculationZhu Yi
This fixes a slab corruption issue in the ipw2200 driver: it essentially multiplied the error log number _twice_ by the size of the error element entry (once explicitly in the code, and once implicitly as part of the regular pointer arithmetic). Cc: Henrik Brix Andersen <brix@gentoo.org> Cc: Bernard Blackham <bernard@blackham.com.au> Cc: Zilvinas Valinskas <zilvinas@gemtek.lt> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --
2005-11-17[PATCH] ipw2200: disallow direct scanning when device is downPekka Enberg
The function ipw_request_direct_scan() should bail out when the device is down. This fixes a lockup caused by wpa_supplicant triggering ipw_request_direct_scan() while the driver was in a middle of a reset due to firmware errors. Thanks to Zilvinas Valinskas for reporting the bug and helping me debug it. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17[MIPS] Update defconfigsRalf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] SEAD: More build fixes.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] TX3927: Try to glue the PCI code.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] SEAD: Delete seadint_init() prototype.Ralf Baechle
There is no definition for seadint_init() and the unprotected prototype breaks compilation of assembler files. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] JMR3927: Fix include wrapper symbol.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] JMR3927: Fix compilation by including <linux/ds1742rtc.h>.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.oRalf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[IDE] Add driver for Sibyte Swarm evaluation boardRalf Baechle
This driver supports the IDE port on the Sibyte Swarm evaluation boards and it's relatives for the BCM1250 family of systems on a chip. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-11-17[MIPS] Alchemy: Console output fixupPantelis Antoniou
This is needed to make console output appear with the new driver... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] Fix documentation typos.Arnaud Giersch
Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] Add const qualifier to writes##bwlq.Arnaud Giersch
Add const qualifier to parameter addr of writes##bwlq. Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] IP32: Fix sparse warnings.Arnaud Giersch
Add __iomem qualifier to crime and mace pointers. Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] IP32 Fix and complete IP32 parport definitionsArnaud Giersch
Fix, complete, and indent IP32 parport definitions. Definition were wrong for CTXINUSE and DMACTIVE (1-bit shift). Add macros DATA_BOUND, DATALEN_SHIFT, and CTRSHIFT. Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] IP32: Export mace symbol.Arnaud Giersch
Export mace symbol so that it can be used in modules. Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] JMR3927: Fix syntax error.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] JMR3927: Undo accidental rename.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] DDB5477: Fix unused variable warning.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] IP32: No need to include <asm/io.h>.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17Add definitions for the Dallas DS1742 RTC / non-volatile memory.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17Add definitions for the Dallas DS17287 RTC.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] Add missing arch defines for the Alchemy MTD driver.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17Add GT64111 PCI ID backYoichi Yuasa
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] zs.c: Resurrect the deceased zs.c for now.Maciej W. Rozycki
Not that it's meant to be sustained for long, but from time to time it's useful to have some console... Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal.Ralf Baechle
The 8250 serial driver now has the ability to deal with the differences between the standard 8250 family of UARTs and their slightly strange brother on Alchemy SOCs. The loss of features is not considered an issue. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[MIPS] Delete duplicate definitions of break codes.Ralf Baechle
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-11-17[libata sata_mv] handle lack of hardware nIEN supportJeff Garzik
Handle errata (it was unintentional on this h/w, whereas its intentional on others) whereby the nIEN bit in Device Control is ignored, leading to a situation where a hardware interrupt completes the qc before the polling code has a chance to. This will get fixed The Right Way(tm) once Albert Lee's irq-pio branch is merged, as the more natural PIO method on this hardware is interrupt-driven.
2005-11-17[libata sata_mv] SATA probe, DMA boundary fixesJeff Garzik
- DMA boundary was being handled incorrectly. Copied the code from ata_fill_sg(), since Marvell has the same DMA boundary needs. (we can't use ata_fill_sg directly since we have different hardware descriptors) - cleaned up the SATA phy reset code, to deal with various errata
2005-11-17[libata] add timeout to commands for which we call wait_completion()Jeff Garzik
2005-11-16[NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUGPatrick McHardy
CC [M] net/netfilter/nf_conntrack_core.o net/netfilter/nf_conntrack_core.c: In function 'nf_ct_unlink_expect': net/netfilter/nf_conntrack_core.c:390: error: 'exp_timeout' undeclared (first use in this function) net/netfilter/nf_conntrack_core.c:390: error: (Each undeclared identifier is reported only once net/netfilter/nf_conntrack_core.c:390: error: for each function it appears in.) Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-16Merge branch 'upstream-fixes'Jeff Garzik
2005-11-16Merge branch 'master'Jeff Garzik
2005-11-16[IPV4,IPV6]: replace handmade list with hlist in IPv{4,6} reassemblyYasuyuki Kozakai
Both of ipq and frag_queue have *next and **prev, and they can be replaced with hlist. Thanks Arnaldo Carvalho de Melo for the suggestion. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-16Merge branch 'upstream-fixes'Jeff Garzik
2005-11-16[ARM] No need to include asm/proc-fns.h into asm/system.hRussell King
In the old days when arm26/arm32 was combined into the same architecture, proc-fns.h provided the xchg implementation for arm26 CPUs. Since we no longer combine these two, this include is no longer required. Remove it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-16[ARM] sa1111.c needs asm/sizes.hRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>