git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
ide
/
pci
/
alim15x3.c
diff --git
a/drivers/ide/pci/alim15x3.c
b/drivers/ide/pci/alim15x3.c
index
8b24b4f
..
d419e4b
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>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-731,7
+730,7
@@
static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
if(m5229_revision <= 0x20)
tmpbyte = (tmpbyte & (~0x02)) | 0x01;
if(m5229_revision <= 0x20)
tmpbyte = (tmpbyte & (~0x02)) | 0x01;
- else if (m5229_revision == 0xc7)
+ else if (m5229_revision == 0xc7
|| m5229_revision == 0xc8
)
tmpbyte |= 0x03;
else
tmpbyte |= 0x01;
tmpbyte |= 0x03;
else
tmpbyte |= 0x01;