update imq patches (fixes #2009)
[openwrt/svn-archive/archive.git] / target / linux / magicbox-2.6 / patches / 100-cf_slot.patch
1 diff -purN linux.old/drivers/ide/ide.c linux.dev/drivers/ide/ide.c
2 --- linux.old/drivers/ide/ide.c 2007-01-10 20:10:37.000000000 +0100
3 +++ linux.dev/drivers/ide/ide.c 2007-04-09 01:25:30.866800288 +0200
4 @@ -1783,6 +1783,7 @@ done:
5 extern void __init pnpide_init(void);
6 extern void __exit pnpide_exit(void);
7 extern void __init h8300_ide_init(void);
8 +extern void __init ide_magicbox_init(void);
9
10 /*
11 * probe_for_hwifs() finds/initializes "known" IDE interfaces
12 @@ -1847,6 +1848,9 @@ static void __init probe_for_hwifs (void
13 #ifdef CONFIG_H8300
14 h8300_ide_init();
15 #endif
16 +#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
17 + ide_magicbox_init();
18 +#endif
19 }
20
21 void ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver)
22 diff -purN linux.old/drivers/ide/Kconfig linux.dev/drivers/ide/Kconfig
23 --- linux.old/drivers/ide/Kconfig 2007-01-10 20:10:37.000000000 +0100
24 +++ linux.dev/drivers/ide/Kconfig 2007-04-09 01:15:27.570515264 +0200
25 @@ -925,6 +925,14 @@ config BLK_DEV_MPC8xx_IDE
26
27 If unsure, say N.
28
29 +config BLK_DEV_MAGICBOX_IDE
30 + bool "MagicBox 2.0 CF IDE support"
31 + depends on 4xx && IDE
32 + help
33 + This option provides support for IDE on MagicBox 2.0 boards.
34 +
35 + If unsure, say N.
36 +
37 choice
38 prompt "Type of MPC8xx IDE interface"
39 depends on BLK_DEV_MPC8xx_IDE
40 diff -purN linux.old/drivers/ide/Makefile linux.dev/drivers/ide/Makefile
41 --- linux.old/drivers/ide/Makefile 2007-01-10 20:10:37.000000000 +0100
42 +++ linux.dev/drivers/ide/Makefile 2007-04-09 00:23:29.332559488 +0200
43 @@ -36,6 +36,7 @@ ide-core-$(CONFIG_BLK_DEV_Q40IDE) += leg
44 # built-in only drivers from ppc/
45 ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o
46 ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o
47 +ide-core-$(CONFIG_BLK_DEV_MAGICBOX_IDE) += ppc/magicbox_ide.o
48
49 # built-in only drivers from h8300/
50 ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o