History log of /linux/drivers/usb/storage/Makefile (Results 226 – 250 of 319)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.28-rc8, v2.6.28-rc7
# c20b15fd 01-Dec-2008 Alan Stern <stern@rowland.harvard.edu>

USB: usb-storage: merge DPCM support into SDDR09

The DPCM subdriver is a little peculiar, in that it's meant to support
devices where LUN 0 is Compact Flash and uses the CB transport whereas
LUN 1 i

USB: usb-storage: merge DPCM support into SDDR09

The DPCM subdriver is a little peculiar, in that it's meant to support
devices where LUN 0 is Compact Flash and uses the CB transport whereas
LUN 1 is SmartMedia and uses the SDDR09 transport. Thus DPCM isn't
really a transport in itself; it's more like a demultiplexer.

Much of the DPCM code is part of the SDDR09 subdriver already, and the
remaining part is fairly small. This patch (as1182) moves that extra
piece into sddr09.c, thereby eliminating dpcm.c. Also eliminated is
the Kconfig entry for DPCM support; it is now listed as part of the
SDDR09 entry.

In order to make sure that the semantics are the same as before, each
unusual_devs entry for DPCM is now present twice: once with DPCM
support if SDDR09 is configured (as before), and once with the
SINGLE_LUN flag and CB support otherwise.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

show more ...


# 7fbb8759 26-Nov-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc6' into core/debug


Revision tags: v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3
# d1a76187 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
arch/um/include/asm/system.h


# 7a9787e1 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks


Revision tags: v2.6.28-rc2, v2.6.28-rc1
# b2aaf8f7 15-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h


# b6a4b7de 20-Oct-2008 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers


# c465a76a 20-Oct-2008 Thomas Gleixner <tglx@linutronix.de>

Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus


# 4cb40f79 20-Oct-2008 Paul Mundt <lethal@linux-sh.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h


# ed8c3174 18-Oct-2008 Anton Vorontsov <cbouatmailru@gmail.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/power/Makefile


# 651dab42 17-Oct-2008 Arjan van de Ven <arjan@linux.intel.com>

Merge commit 'linus/master' into merge-linus

Conflicts:

arch/x86/kvm/i8254.c


# 6dc64725 15-Oct-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin'

Manual fixup of conflicts on:

arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h


# 7e69a8c4 14-Oct-2008 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branch 's3c-move' into devel

Conflicts:

arch/arm/mach-versatile/core.c


# e758936e 13-Oct-2008 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/asm-x86/statfs.h


# accba5f3 13-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into oprofile-v2

Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h


# 0d629501 12-Oct-2008 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28


# 620f2efc 12-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/xsave


# a9b9e81c 12-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/memory-corruption-check


# 1389ac4b 12-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/signal

Conflicts:
arch/x86/kernel/signal_64.c


# 4c7145a1 12-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/spinlocks

Done to prevent this failure of an Octopus merge:

Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/includ

Merge branch 'linus' into x86/spinlocks

Done to prevent this failure of an Octopus merge:

Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed

show more ...


# 365d46dc 12-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/xen

Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c


# 206855c3 12-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/urgent' into core/signal

Conflicts:
arch/x86/kernel/signal_64.c


# 56c5d900 11-Oct-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

sound/core/memalloc.c


# 3dd392a4 10-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/pat2

Conflicts:
arch/x86/mm/init_64.c


# 8eb95f28 10-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27' into timers/hpet


Revision tags: v2.6.27, v2.6.27-rc9
# a5e8546a 06-Oct-2008 Simon Horman <horms@verge.net.au>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6


12345678910>>...13