diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/ide/triflex.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/ide/triflex.c')
| -rw-r--r-- | drivers/ide/triflex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c index 7953447eae0..e53a1b78378 100644 --- a/drivers/ide/triflex.c +++ b/drivers/ide/triflex.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | * Loosely based on the piix & svwks drivers. | 22 | * Loosely based on the piix & svwks drivers. |
| 23 | * | 23 | * |
| 24 | * Documentation: | 24 | * Documentation: |
| 25 | * Not publically available. | 25 | * Not publicly available. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |