Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / common / scoop.c

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 9012004321dde0e9e2780899c79d53d03b083b5a..c11af1e4bad309d4054b7eed7fe3c285cefc8fbf 100644 (file)
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -44,12 +44,12 @@ void reset_scoop(struct device *dev)
 {
        struct scoop_dev *sdev = dev_get_drvdata(dev);
 
-       iowrite16(0x0100, sdev->base + SCOOP_MCR);  // 00
-       iowrite16(0x0000, sdev->base + SCOOP_CDR);  // 04
-       iowrite16(0x0000, sdev->base + SCOOP_CCR);  // 10
-       iowrite16(0x0000, sdev->base + SCOOP_IMR);  // 18
-       iowrite16(0x00FF, sdev->base + SCOOP_IRM);  // 14
-       iowrite16(0x0000, sdev->base + SCOOP_ISR);  // 1C
+       iowrite16(0x0100, sdev->base + SCOOP_MCR);  /* 00 */
+       iowrite16(0x0000, sdev->base + SCOOP_CDR);  /* 04 */
+       iowrite16(0x0000, sdev->base + SCOOP_CCR);  /* 10 */
+       iowrite16(0x0000, sdev->base + SCOOP_IMR);  /* 18 */
+       iowrite16(0x00FF, sdev->base + SCOOP_IRM);  /* 14 */
+       iowrite16(0x0000, sdev->base + SCOOP_ISR);  /* 1C */
        iowrite16(0x0000, sdev->base + SCOOP_IRM);
 }