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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
ide
/
legacy
/
macide.c
diff --git
a/drivers/ide/legacy/macide.c
b/drivers/ide/legacy/macide.c
index
90cac60
..
b1730d7
100644
(file)
--- a/
drivers/ide/legacy/macide.c
+++ b/
drivers/ide/legacy/macide.c
@@
-11,7
+11,6
@@
* more details.
*/
* more details.
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
@@
-79,7
+78,7
@@
int macide_ack_intr(ide_hwif_t* hwif)
}
#ifdef CONFIG_BLK_DEV_MAC_MEDIABAY
}
#ifdef CONFIG_BLK_DEV_MAC_MEDIABAY
-static void macide_mediabay_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static void macide_mediabay_interrupt(int irq, void *dev_id)
{
int state = baboon->mb_status & 0x04;
{
int state = baboon->mb_status & 0x04;