summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] USB: Delete leftovers from bluetty driverMarcel Holtmann2005-11-172-50/+6
| | | | | | | | | | This patch deletes the bluetooth.txt help file of the bluetty driver and hands over its major device nodes for character devices to the RFCOMM TTY implementation of the Bluetooth subsystem. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] USB: fix 'unused variable' warningDmitry Torokhov2005-11-171-2/+1
| | | | | | | | USB: fix 'unused variable' warning Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] USB: wacom tablet driver updatePing Cheng2005-11-171-23/+110
| | | | | | | | | 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>
* [PATCH] USB: add new wacom devices to usb hid-core listPing Cheng2005-11-171-0/+12
| | | | | | | | 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>
* [PATCH] USB Serial: rename ChangeLog.oldGreg Kroah-Hartman2005-11-171-1/+1
| | | | | | | | 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>
* [PATCH] USB: fix build breakage in dummy_hcd.cGreg Kroah-Hartman2005-11-171-2/+2
| | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix IXP4xx I2C driver build breakageDeepak Saxena2005-11-171-3/+4
| | | | | | | Platform device conversion missed a couple of spots. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-11-1779-900/+2463
|\
| * [MIPS] Update defconfigsRalf Baechle2005-11-1745-654/+1917
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] SEAD: More build fixes.Ralf Baechle2005-11-173-15/+12
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] TX3927: Try to glue the PCI code.Ralf Baechle2005-11-171-71/+43
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] SEAD: Delete seadint_init() prototype.Ralf Baechle2005-11-171-2/+0
| | | | | | | | | | | | | | 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>
| * [MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask.Ralf Baechle2005-11-171-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] JMR3927: Fix include wrapper symbol.Ralf Baechle2005-11-171-3/+3
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] JMR3927: Fix compilation by including <linux/ds1742rtc.h>.Ralf Baechle2005-11-171-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path.Ralf Baechle2005-11-171-0/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.oRalf Baechle2005-11-171-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [IDE] Add driver for Sibyte Swarm evaluation boardRalf Baechle2005-11-174-1/+207
| | | | | | | | | | | | | | | | 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>
| * [MIPS] Alchemy: Console output fixupPantelis Antoniou2005-11-171-1/+1
| | | | | | | | | | | | This is needed to make console output appear with the new driver... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] Fix documentation typos.Arnaud Giersch2005-11-171-6/+8
| | | | | | | | | | Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] Add const qualifier to writes##bwlq.Arnaud Giersch2005-11-171-3/+3
| | | | | | | | | | | | | | 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>
| * [MIPS] IP32: Fix sparse warnings.Arnaud Giersch2005-11-173-4/+4
| | | | | | | | | | | | | | 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>
| * [MIPS] IP32 Fix and complete IP32 parport definitionsArnaud Giersch2005-11-171-16/+26
| | | | | | | | | | | | | | | | | | 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>
| * [MIPS] IP32: Export mace symbol.Arnaud Giersch2005-11-171-0/+3
| | | | | | | | | | | | | | 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>
| * [MIPS] JMR3927: Fix syntax error.Ralf Baechle2005-11-171-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] JMR3927: Undo accidental rename.Ralf Baechle2005-11-172-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] DDB5477: Fix unused variable warning.Ralf Baechle2005-11-171-3/+7
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] IP32: No need to include <asm/io.h>.Ralf Baechle2005-11-171-3/+4
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Add definitions for the Dallas DS1742 RTC / non-volatile memory.Ralf Baechle2005-11-171-0/+53
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Add definitions for the Dallas DS17287 RTC.Ralf Baechle2005-11-171-0/+67
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] Add missing arch defines for the Alchemy MTD driver.Ralf Baechle2005-11-174-0/+19
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Add GT64111 PCI ID backYoichi Yuasa2005-11-171-0/+1
| | | | | | | | | | Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * [MIPS] zs.c: Resurrect the deceased zs.c for now.Maciej W. Rozycki2005-11-172-93/+70
| | | | | | | | | | | | | | | | 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>
| * [MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal.Ralf Baechle2005-11-171-0/+10
| | | | | | | | | | | | | | | | | | 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>
| * [MIPS] Delete duplicate definitions of break codes.Ralf Baechle2005-11-171-21/+0
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | x86: Fix silly typo in recent <asm/signal.h> fixesLinus Torvalds2005-11-171-1/+1
| | | | | | | | | | | | | | The second __const_sigaddset() should have been a sigdelset.. Compile trouble noted by Greg K-H. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-11-173-52/+31
|\ \
| * | [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUGPatrick McHardy2005-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | [IPV4,IPV6]: replace handmade list with hlist in IPv{4,6} reassemblyYasuyuki Kozakai2005-11-162-51/+30
| |/ | | | | | | | | | | | | | | | | 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>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-11-1734-99/+163
|\ \
| * | [ARM] No need to include asm/proc-fns.h into asm/system.hRussell King2005-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | [ARM] sa1111.c needs asm/sizes.hRussell King2005-11-161-0/+1
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Use unsigned long not u32 in atomic_cmpxchgRussell King2005-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since atomic.h does not include types.h, u32 may not be defined. Since atomics are supposed to work on unsigned long quantities, use unsigned long instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Move zone adjustment for SA1111 on SA11x0 platformsRussell King2005-11-162-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, using PAGE_SHIFT in asm/arch/memory.h is unsafe, and we can't include asm/page.h into this file because then we have a circular dependency. Move the offending code to arch/arm/common/sa1111.c instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Add linux/compiler.h includes where requiredRussell King2005-11-164-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | atomic.h, bitops.h and mmu_context.h are using likely/unlikely. thread_info.h uses __attribute_const__. Hence these files require linux/compiler.h to be included. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3162/1: S3C2410 - updated defconfigBen Dooks2005-11-161-25/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Minor changes, including add SysRq, selecting the DM9000 as a built-in driver, not as a module, and selecting the framebuffer. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3161/1: BAST - fix commas on end of structsBen Dooks2005-11-161-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Make the use of , on the lsat entry structs consistenent through arch/arm/mach-s3c2410/mach-bast.c Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3165/1: fix atomic_cmpxchg() implementation for ARMv6+Nicolas Pitre2005-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre If 'old' and 'oldval' are different then 'res' never gets set. In that case, if ever %0 happened to contain anything but zero (rather likely) then the code will loop forever (or until another CPU just come along and change the atomic value to match 'old' which is rather unlikely). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] compressed/head.S debugging defaults to asm/arch/debug-macro.SRussell King2005-11-161-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | Since we want new platforms to use debug-macro.S, make the decompressor debugging method default to using this include file rather than having new platforms add to an #if defined(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] Include asm/hardware.h instead of asm/arch/hardware.hRussell King2005-11-1619-19/+19
| | | | | | | | | | | | | | | | | | Rationalise hardware.h include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>