diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /drivers/net/hp.c | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
| download | kernel-crypto-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.gz kernel-crypto-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.xz kernel-crypto-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/net/hp.c')
| -rw-r--r-- | drivers/net/hp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c index 551a71b3c5f..29470970aa2 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c @@ -75,7 +75,7 @@ static void hp_init_card(struct net_device *dev); /* My default is IRQ5 0 1 2 3 4 5 6 7 8 9 10 11 */ static char irqmap[16] __initdata= { 0, 0, 4, 6, 8,10, 0,14, 0, 4, 2,12,0,0,0,0}; - + /* Probe for an HP LAN adaptor. Also initialize the card and fill in STATION_ADDR with the station address. */ |