Skip to content

L
linux-davinci-2.6.23
Commit d4bf2053 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

parents 8907e94b e2b1be56
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 38 deletions
drivers/scsi/sata_mv.c
View file @ d4bf2053
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* sata_mv.c - Marvell SATA support * sata_mv.c - Marvell SATA support
* *
* Copyright 2005: EMC Corporation, all rights reserved. * Copyright 2005: EMC Corporation, all rights reserved.
* Copyright 2005 Red Hat, Inc. All rights reserved.
* *
* Please ALWAYS copy linux-ide@vger.kernel.org on emails. * Please ALWAYS copy linux-ide@vger.kernel.org on emails.
* *
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "sata_mv" #define DRV_NAME "sata_mv"
#define DRV_VERSION "0.25" #define DRV_VERSION "0.5"
enum { enum {
/* BAR's are enumerated in terms of pci_resource_start() terms */ /* BAR's are enumerated in terms of pci_resource_start() terms */
......
drivers/scsi/sata_sil24.c
View file @ d4bf2053
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment