Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / edac / i5000_edac.c

diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 3d0b726304fefd43ae2d8aa6c454b18159bb4372..4dc3ac25a42261946fe9b8fc6798464ffc104db1 100644 (file)
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1372,7 +1372,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
         * actual number of slots/dimms per channel, we thus utilize the
         * resource as specified by the chipset. Thus, we might have
         * have more DIMMs per channel than actually on the mobo, but this
-        * allows the driver to support upto the chipset max, without
+        * allows the driver to support up to the chipset max, without
         * some fancy mobo determination.
         */
        i5000_get_dimm_and_channel_counts(pdev, &num_dimms_per_channel,