domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 2.6.26

Browse Source 
SVN-Revision: 12066
This commit is contained in:
Gabor Juhos
2008-08-01 19:34:37 +00:00
parent 245c16ba5d
commit 014a020b5f
4 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
target/linux/magicbox/patches/100-cf_slot.patch
View File

@@ -1,30 +1,18 @@
Index: linux-2.6.24.7/drivers/ide/ide.c
===================================================================
--- linux-2.6.24.7.orig/drivers/ide/ide.c
+++ linux-2.6.24.7/drivers/ide/ide.c
@@ -1563,6 +1563,7 @@ done:
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);
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -494,6 +494,9 @@
/*
* probe_for_hwifs() finds/initializes "known" IDE interfaces
@@ -1627,6 +1628,9 @@ static void __init probe_for_hwifs (void
#ifdef CONFIG_H8300
h8300_ide_init();
return -EPERM;
#endif
+#ifdef CONFIG_BLK_DEV_MAGICBOX_IDE
+ ide_magicbox_init();
+#endif
}
/*
Index: linux-2.6.24.7/drivers/ide/Kconfig
===================================================================
--- linux-2.6.24.7.orig/drivers/ide/Kconfig
+++ linux-2.6.24.7/drivers/ide/Kconfig
@@ -1018,6 +1018,14 @@ config BLK_DEV_MPC8xx_IDE
int set_pio_mode(ide_drive_t *drive, int arg)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -928,6 +928,14 @@
If unsure, say N.
@@ -39,15 +27,10 @@ Index: linux-2.6.24.7/drivers/ide/Kconfig
choice
prompt "Type of MPC8xx IDE interface"
depends on BLK_DEV_MPC8xx_IDE
Index: linux-2.6.24.7/drivers/ide/Makefile
===================================================================
--- linux-2.6.24.7.orig/drivers/ide/Makefile
+++ linux-2.6.24.7/drivers/ide/Makefile
@@ -37,6 +37,7 @@ ide-core-$(CONFIG_BLK_DEV_Q40IDE) += leg
# 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
--- a/drivers/ide/ppc/Makefile
+++ b/drivers/ide/ppc/Makefile
@@ -1,3 +1,4 @@
# built-in only drivers from h8300/
ide-core-$(CONFIG_IDE_H8300) += h8300/ide-h8300.o
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