Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6

* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
  bcma: fix invalid PMU chip control masks
  [libata] pata_cmd64x: whitespace cleanup
  libata-acpi: fix up for acpi_pm_device_sleep_state API
  sata_dwc_460ex: device tree may specify dma_channel
  ahci, trivial: fixed coding style issues related to braces
  ahci_platform: add hibernation callbacks
  libata-eh.c: local functions should not be exposed globally
  libata-transport.c: local functions should not be exposed globally
  sata_dwc_460ex: support hardreset
  ata: use module_pci_driver
  drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
  pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
  ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
  [libata] Prevent interface errors with Seagate FreeAgent GoFlex
  drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
  libata-acpi: add missing inlines in libata.h
  i2c-omap: Add support for I2C_M_STOP message flag
  i2c: Fall back to emulated SMBus if the operation isn't supported natively
  i2c: Add SCCB support
  i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
  ...

1 files changed, 0 insertions, 68 deletions

diff --git a/lib/mpi/mpi-cmp.c b/lib/mpi/mpi-cmp.c
deleted file mode 100644
index 914bc42a8a80..000000000000
--- a/lib/mpi/mpi-cmp.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* mpi-cmp.c  -  MPI functions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include "mpi-internal.h"
-
-int mpi_cmp_ui(MPI u, unsigned long v)
-{
-        mpi_limb_t limb = v;
-
-        mpi_normalize(u);
-        if (!u->nlimbs && !limb)
-                return 0;
-        if (u->sign)
-                return -1;
-        if (u->nlimbs > 1)
-                return 1;
-
-        if (u->d[0] == limb)
-                return 0;
-        else if (u->d[0] > limb)
-                return 1;
-        else
-                return -1;
-}
-
-int mpi_cmp(MPI u, MPI v)
-{
-        mpi_size_t usize, vsize;
-        int cmp;
-
-        mpi_normalize(u);
-        mpi_normalize(v);
-        usize = u->nlimbs;
-        vsize = v->nlimbs;
-        if (!u->sign && v->sign)
-                return 1;
-        if (u->sign && !v->sign)
-                return -1;
-        if (usize != vsize && !u->sign && !v->sign)
-                return usize - vsize;
-        if (usize != vsize && u->sign && v->sign)
-                return vsize + usize;
-        if (!usize)
-                return 0;
-        cmp = mpihelp_cmp(u->d, v->d, usize);
-        if (!cmp)
-                return 0;
-        if ((cmp < 0 ? 1 : 0) == (u->sign ? 1 : 0))
-                return 1;
-        return -1;
-}