* Upgrade Magicbox to 2.6.23
[openwrt/svn-archive/archive.git] / target / linux / magicbox / patches / 100-cf_slot.patch
1 Index: linux-2.6.22-rc6/drivers/ide/ide.c
2 ===================================================================
3 --- linux-2.6.22-rc6.orig/drivers/ide/ide.c 2007-06-28 08:23:49.463514496 +0200
4 +++ linux-2.6.22-rc6/drivers/ide/ide.c 2007-06-28 08:23:54.658724704 +0200
5 @@ -1604,6 +1604,7 @@
6 extern void __init pnpide_init(void);
7 extern void __exit pnpide_exit(void);
8 extern void __init h8300_ide_init(void);
9 +extern void __init ide_magicbox_init(void);
10
11 /*
12 * probe_for_hwifs() finds/initializes "known" IDE interfaces
13 @@ -1668,6 +1669,9 @@
14 #ifdef CONFIG_H8300
15 h8300_ide_init();
16 #endif
17 +#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
18 + ide_magicbox_init();
19 +#endif
20 }
21
22 /*
23 Index: linux-2.6.22-rc6/drivers/ide/Kconfig
24 ===================================================================
25 --- linux-2.6.22-rc6.orig/drivers/ide/Kconfig 2007-06-28 08:23:49.470513432 +0200
26 +++ linux-2.6.22-rc6/drivers/ide/Kconfig 2007-06-28 08:23:54.658724704 +0200
27 @@ -946,6 +946,14 @@
28
29 If unsure, say N.
30
31 +config BLK_DEV_MAGICBOX_IDE
32 + bool "MagicBox 2.0 CF IDE support"
33 + depends on 4xx && IDE
34 + help
35 + This option provides support for IDE on MagicBox 2.0 boards.
36 +
37 + If unsure, say N.
38 +
39 choice
40 prompt "Type of MPC8xx IDE interface"
41 depends on BLK_DEV_MPC8xx_IDE
42 Index: linux-2.6.22-rc6/drivers/ide/Makefile
43 ===================================================================
44 --- linux-2.6.22-rc6.orig/drivers/ide/Makefile 2007-06-28 08:23:49.478512216 +0200
45 +++ linux-2.6.22-rc6/drivers/ide/Makefile 2007-06-28 08:23:54.659724552 +0200
46 @@ -37,6 +37,7 @@
47 # built-in only drivers from ppc/
48 ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o
49 ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o
50 +ide-core-$(CONFIG_BLK_DEV_MAGICBOX_IDE) += ppc/magicbox_ide.o
51
52 # built-in only drivers from h8300/
53 ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o