Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux

[mv-sheeva.git] / drivers / pcmcia / xxs1500_ss.c

diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 61560cd6e2877b5b37f1c804e291a8d722027503..201ccfa1e97b59a383e2fe05fd12082e3c63f6d5 100644 (file)
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/resource.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 
 #include <pcmcia/cs_types.h>
@@ -218,11 +219,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
 
        ret = -ENODEV;
 
-       /*
-        * pseudo-attr:  The 32bit address of the PCMCIA attribute space
-        * for this socket (usually the 36bit address shifted 4 to the
-        * right).
-        */
+       /* 36bit PCMCIA Attribute area address */
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr");
        if (!r) {
                dev_err(&pdev->dev, "missing 'pcmcia-attr' resource!\n");
@@ -230,10 +227,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
        }
        sock->phys_attr = r->start;
 
-       /*
-        * pseudo-mem:  The 32bit address of the PCMCIA memory space for
-        * this socket (usually the 36bit address shifted 4 to the right)
-        */
+       /* 36bit PCMCIA Memory area address */
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem");
        if (!r) {
                dev_err(&pdev->dev, "missing 'pcmcia-mem' resource!\n");
@@ -241,10 +235,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
        }
        sock->phys_mem = r->start;
 
-       /*
-        * pseudo-io:  The 32bit address of the PCMCIA IO space for this
-        * socket (usually the 36bit address shifted 4 to the right).
-        */
+       /* 36bit PCMCIA IO area address */
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io");
        if (!r) {
                dev_err(&pdev->dev, "missing 'pcmcia-io' resource!\n");