Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c

path: root/drivers/parport/multiface.h

#ifndef _MULTIFACE_H_
#define _MULTIFACE_H_

/*
 * Defines for SerialMaster, Multiface Card II and Multiface Card III
 * The addresses given below are offsets to the board base address
 * 
 * 6.11.95 Joerg Dorchain (dorchain@mpi-sb.mpg.de)
 *
 */

#define PIA_REG_PADWIDTH 255

#define DUARTBASE 0x0000
#define PITBASE   0x0100
#define ROMBASE   0x0200
#define PIABASE   0x4000

#endif