Commit:     dc4b6fd620aec395048b2877daca87ba7bfcd5e0
Parent:     0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01
Author:     Kumar Gala <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 11 22:28:33 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Tue Sep 11 22:28:33 2007 +0200

    mpc8xx: Only build mpc8xx on arch/ppc
    Currently the mpc8xx ide driver will only work on arch/ppc so only
    allow it to be built there.  Also, killed a minor include that isn't
    actually used by the driver.
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
    Cc: Paul Mackerras <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
 drivers/ide/Kconfig      |    2 +-
 drivers/ide/ppc/mpc8xx.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 7adb61b..24ad104 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -946,7 +946,7 @@ config BLK_DEV_Q40IDE
 config BLK_DEV_MPC8xx_IDE
        bool "MPC8xx IDE support"
-       depends on 8xx && IDE=y && BLK_DEV_IDE=y
+       depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
        select IDE_GENERIC
          This option provides support for IDE on Motorola MPC8xx Systems.
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 8859fe2..dab79af 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -32,7 +32,6 @@
 #include <asm/mpc8xx.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
-#include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/ide.h>
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to