Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-03-12 13:35:31 +0100
committerThomas Gleixner <tglx@linutronix.de>2010-03-12 13:35:57 +0100
commit2c5f66a7fabe95671f7cd44ce5a29819414fa2b2 (patch)
tree85eac8cb6073f8ae1c2cdcb5e95cd48f3e4ba56b
parentaf5d4b64855a9fbd5fe9486d2eeae84f55b39ee5 (diff)
Revert "Loongson: add a new option FUJITSU_QUIRKS"
This reverts commit 876c52cc046e00eaa2ffc5124dc187106ef57594. Breaks !MIPS Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/mips/loongson/Kconfig14
-rw-r--r--drivers/ide/ide-iops.c6
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index a105316f2d7d..ab08247598ed 100644
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -83,17 +83,3 @@ config LOONGSON_UART_BASE
bool
default y
depends on EARLY_PRINTK || SERIAL_8250
-
-config FUJITSU_QUIRKS
- bool "Enable the quirks of fujitsu disk on some old FuLoong-2F series"
- default n
- depends on LEMOTE_MACH2F
- help
- This option enables the quirks of fujitsu disk on some old FuLoong-2F
- series(6002, 6003), If you want to use the libata, this option must
- be enabled, otherwise, the kernel will report "IRQ #14 nobody cared".
- but for the old IDE driver, this option is not needed and for some
- new FuLoong-2F series(6004, 6005, 6014, 6015), this must be disabled
- to avoid the kernel hang on booting.
-
- If unsure, say N.
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 9dba71e5fe7d..53a085c35616 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -26,7 +26,6 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/bootinfo.h>
void SELECT_MASK(ide_drive_t *drive, int mask)
{
@@ -301,11 +300,6 @@ void ide_check_nien_quirk_list(ide_drive_t *drive)
{
const char **list, *m = (char *)&drive->id[ATA_ID_PROD];
-#ifdef CONFIG_FUJITSU_QUIRKS
- if (mips_machtype != MACH_LEMOTE_YL2F89)
- return;
-#endif
-
for (list = nien_quirk_list; *list != NULL; list++)
if (strstr(m, *list) != NULL) {
drive->dev_flags |= IDE_DFLAG_NIEN_QUIRK;