[kernel] refresh 2.6.26 patches

[openwrt.git] / target / linux / magicbox / patches / 100-cf_slot.patch

diff --git a/target/linux/magicbox/patches/100-cf_slot.patch b/target/linux/magicbox/patches/100-cf_slot.patch
index e15d522..c374973 100644 (file)
--- a/target/linux/magicbox/patches/100-cf_slot.patch
+++ b/target/linux/magicbox/patches/100-cf_slot.patch
@@ -1,23 +1,11 @@
---- a/drivers/ide/ide.c
-+++ b/drivers/ide/ide.c
-@@ -494,6 +494,9 @@
- 
-       return -EPERM;
- #endif
-+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
-+      ide_magicbox_init();
-+#endif
- }
- 
- int set_pio_mode(ide_drive_t *drive, int arg)
 --- a/drivers/ide/Kconfig
 +++ b/drivers/ide/Kconfig
-@@ -928,6 +928,14 @@
+@@ -928,6 +928,14 @@ config BLK_DEV_MPC8xx_IDE
  
          If unsure, say N.
  
 +config BLK_DEV_MAGICBOX_IDE
-+      bool "MagicBox 2.0 CF IDE support"
++      tristate "MagicBox 2.0 CF IDE support"
 +      depends on 4xx && IDE
 +      help
 +        This option provides support for IDE on MagicBox 2.0 boards.