Title: [9411] trunk/drivers/staging/iio/dds/ad9832.c: staging: iio: ad9832 Avoid namespace collision with generic defines
- Revision
- 9411
- Author
- hennerich
- Date
- 2010-10-25 11:04:31 -0400 (Mon, 25 Oct 2010)
Log Message
staging: iio: ad9832 Avoid namespace collision with generic defines
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/dds/ad9832.c (9410 => 9411)
--- trunk/drivers/staging/iio/dds/ad9832.c 2010-10-25 14:59:01 UTC (rev 9410)
+++ trunk/drivers/staging/iio/dds/ad9832.c 2010-10-25 15:04:31 UTC (rev 9411)
@@ -23,11 +23,11 @@
#define value_mask (u16)0xf000
#define cmd_shift 12
#define add_shift 8
-#define SYNC (1 << 13)
-#define SELSRC (1 << 12)
-#define SLEEP (1 << 13)
-#define RESET (1 << 12)
-#define CLR (1 << 11)
+#define AD9832_SYNC (1 << 13)
+#define AD9832_SELSRC (1 << 12)
+#define AD9832_SLEEP (1 << 13)
+#define AD9832_RESET (1 << 12)
+#define AD9832_CLR (1 << 11)
#define ADD_FREQ0LL 0x0
#define ADD_FREQ0HL 0x1
@@ -131,7 +131,7 @@
int ret;
u16 config = 0;
- config = 0x3 << 14 | SLEEP | RESET | CLR;
+ config = 0x3 << 14 | AD9832_SLEEP | AD9832_RESET | AD9832_CLR;
mutex_lock(&st->lock);
@@ -144,7 +144,7 @@
if (ret)
goto error_ret;
- config = 0x2 << 14 | SYNC | SELSRC;
+ config = 0x2 << 14 | AD9832_SYNC | AD9832_SELSRC;
xfer.len = 2;
xfer.tx_buf = &config;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
