projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
ide
/
pci
/
alim15x3.c
diff --git
a/drivers/ide/pci/alim15x3.c
b/drivers/ide/pci/alim15x3.c
index
cf84350
..
351dab2
100644
(file)
--- a/
drivers/ide/pci/alim15x3.c
+++ b/
drivers/ide/pci/alim15x3.c
@@
-27,7
+27,6
@@
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-731,6
+730,8
@@
static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
if(m5229_revision <= 0x20)
tmpbyte = (tmpbyte & (~0x02)) | 0x01;
+ else if (m5229_revision == 0xc7)
+ tmpbyte |= 0x03;
else
tmpbyte |= 0x01;