From 1e102bea26cfba9f605bb6982428d516b5670fdc Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 13 Mar 2009 17:23:15 +0000 Subject: [PATCH] no longer needed svn path=/dists/trunk/linux-2.6/; revision=13106 --- debian/patches/bugfix/arm/disable-orion5x_wdt.patch | 13 ------------- debian/patches/series/1~experimental.1 | 1 - 2 files changed, 14 deletions(-) delete mode 100644 debian/patches/bugfix/arm/disable-orion5x_wdt.patch diff --git a/debian/patches/bugfix/arm/disable-orion5x_wdt.patch b/debian/patches/bugfix/arm/disable-orion5x_wdt.patch deleted file mode 100644 index bc329fca0..000000000 --- a/debian/patches/bugfix/arm/disable-orion5x_wdt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 09a3d55..380409f 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -233,7 +233,7 @@ config DAVINCI_WATCHDOG - - config ORION5X_WATCHDOG - tristate "Orion5x watchdog" -- depends on ARCH_ORION5X -+ depends on ARCH_ORION5X && BROKEN - help - Say Y here if to include support for the watchdog timer - in the Orion5x ARM SoCs. diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index 76c6b9cb7..2bde4d5e7 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -20,7 +20,6 @@ #+ bugfix/ia64/hardcode-arch-script-output.patch + bugfix/mips/disable-advansys.patch + bugfix/arm/disable-scsi_acard.patch -+ bugfix/arm/disable-orion5x_wdt.patch + bugfix/mips/disable-werror.patch + bugfix/fix-hifn_795X-divdi3.patch + bugfix/powerpc/mm-mol.patch