diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-01-27 21:20:06 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-01-27 21:20:06 +0000 |
| commit | 9d127a9846e26f2d6d0b289fcfd0395483aecaff (patch) | |
| tree | 0192b012f3896849d29d871c932fed482cb4d558 /target/linux/magicbox/patches-2.6.22/100-cf_slot.patch | |
| parent | 41992fe1076d0456e29735f1fd0d0341a2ed6816 (diff) | |
| download | upstream-9d127a9846e26f2d6d0b289fcfd0395483aecaff.tar.gz upstream-9d127a9846e26f2d6d0b289fcfd0395483aecaff.tar.bz2 upstream-9d127a9846e26f2d6d0b289fcfd0395483aecaff.zip | |
* Upgrade Magicbox to 2.6.23 * Rename directories
SVN-Revision: 10286
Diffstat (limited to 'target/linux/magicbox/patches-2.6.22/100-cf_slot.patch')
| -rw-r--r-- | target/linux/magicbox/patches-2.6.22/100-cf_slot.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch b/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch deleted file mode 100644 index 3a5dde7709..0000000000 --- a/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: linux-2.6.22-rc6/drivers/ide/ide.c -=================================================================== ---- linux-2.6.22-rc6.orig/drivers/ide/ide.c 2007-06-28 08:23:49.463514496 +0200 -+++ linux-2.6.22-rc6/drivers/ide/ide.c 2007-06-28 08:23:54.658724704 +0200 -@@ -1604,6 +1604,7 @@ - extern void __init pnpide_init(void); - extern void __exit pnpide_exit(void); - extern void __init h8300_ide_init(void); -+extern void __init ide_magicbox_init(void); - - /* - * probe_for_hwifs() finds/initializes "known" IDE interfaces -@@ -1668,6 +1669,9 @@ - #ifdef CONFIG_H8300 - h8300_ide_init(); - #endif -+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE -+ ide_magicbox_init(); -+#endif - } - - /* -Index: linux-2.6.22-rc6/drivers/ide/Kconfig -=================================================================== ---- linux-2.6.22-rc6.orig/drivers/ide/Kconfig 2007-06-28 08:23:49.470513432 +0200 -+++ linux-2.6.22-rc6/drivers/ide/Kconfig 2007-06-28 08:23:54.658724704 +0200 -@@ -946,6 +946,14 @@ - - 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 -Index: linux-2.6.22-rc6/drivers/ide/Makefile -=================================================================== ---- linux-2.6.22-rc6.orig/drivers/ide/Makefile 2007-06-28 08:23:49.478512216 +0200 -+++ linux-2.6.22-rc6/drivers/ide/Makefile 2007-06-28 08:23:54.659724552 +0200 -@@ -37,6 +37,7 @@ - # built-in only drivers from ppc/ - ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o - ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o -+ide-core-$(CONFIG_BLK_DEV_MAGICBOX_IDE) += ppc/magicbox_ide.o - - # built-in only drivers from h8300/ - ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o |