2008-08-01 19:34:37 +00:00
|
|
|
--- a/drivers/ide/ide.c
|
|
|
|
|
+++ b/drivers/ide/ide.c
|
2008-08-02 12:38:33 +00:00
|
|
|
@@ -78,6 +78,10 @@
|
|
|
|
|
/* default maximum number of failures */
|
|
|
|
|
#define IDE_DEFAULT_MAX_FAILURES 1
|
|
|
|
|
|
|
|
|
|
+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
|
|
|
|
|
+extern void __init ide_magicbox_init(void);
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
struct class *ide_port_class;
|
|
|
|
|
|
|
|
|
|
static const u8 ide_hwif_to_major[] = { IDE0_MAJOR, IDE1_MAJOR,
|
|
|
|
|
@@ -494,6 +498,9 @@
|
2007-06-28 20:42:21 +00:00
|
|
|
|
2008-08-01 19:34:37 +00:00
|
|
|
return -EPERM;
|
2007-06-28 20:42:21 +00:00
|
|
|
#endif
|
|
|
|
|
+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
|
|
|
|
|
+ ide_magicbox_init();
|
|
|
|
|
+#endif
|
|
|
|
|
}
|
|
|
|
|
|
2008-08-01 19:34:37 +00:00
|
|
|
int set_pio_mode(ide_drive_t *drive, int arg)
|
|
|
|
|
--- a/drivers/ide/Kconfig
|
|
|
|
|
+++ b/drivers/ide/Kconfig
|
|
|
|
|
@@ -928,6 +928,14 @@
|
2007-06-28 20:42:21 +00:00
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
|
|
|
|
|
+config BLK_DEV_MAGICBOX_IDE
|
|
|
|
|
+ bool "MagicBox 2.0 CF IDE support"
|
|
|
|
|
+ depends on 4xx && IDE
|
|
|
|
|
+ help
|
|
|
|
|
+ This option provides support for IDE on MagicBox 2.0 boards.
|
|
|
|
|
+
|
|
|
|
|
+ If unsure, say N.
|
|
|
|
|
+
|
|
|
|
|
choice
|
|
|
|
|
prompt "Type of MPC8xx IDE interface"
|
|
|
|
|
depends on BLK_DEV_MPC8xx_IDE
|
2008-08-01 19:34:37 +00:00
|
|
|
--- a/drivers/ide/ppc/Makefile
|
|
|
|
|
+++ b/drivers/ide/ppc/Makefile
|
|
|
|
|
@@ -1,3 +1,4 @@
|
2007-06-28 20:42:21 +00:00
|
|
|
|
2008-08-01 19:34:37 +00:00
|
|
|
obj-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o
|
|
|
|
|
obj-$(CONFIG_BLK_DEV_MPC8xx_IDE) += mpc8xx.o
|
|
|
|
|
+obj-$(CONFIG_BLK_DEV_MAGICBOX_IDE) += magicbox_ide.o
|
