Title: [7840] trunk/sound/soc/blackfin: fix compiling error
- Revision
- 7840
- Author
- bhsong
- Date
- 2009-11-17 22:42:06 -0500 (Tue, 17 Nov 2009)
Log Message
fix compiling error
Modified Paths
Diff
Modified: trunk/sound/soc/blackfin/bf5xx-sport.c (7839 => 7840)
--- trunk/sound/soc/blackfin/bf5xx-sport.c 2009-11-18 03:32:59 UTC (rev 7839)
+++ trunk/sound/soc/blackfin/bf5xx-sport.c 2009-11-18 03:42:06 UTC (rev 7840)
@@ -34,7 +34,6 @@
#include <linux/gpio.h>
#include <linux/bug.h>
#include <asm/portmux.h>
-#include <asm/bfin_sport.h>
#include <asm/dma.h>
#include <asm/blackfin.h>
#include <asm/cacheflush.h>
Modified: trunk/sound/soc/blackfin/bf5xx-sport.h (7839 => 7840)
--- trunk/sound/soc/blackfin/bf5xx-sport.h 2009-11-18 03:32:59 UTC (rev 7839)
+++ trunk/sound/soc/blackfin/bf5xx-sport.h 2009-11-18 03:42:06 UTC (rev 7840)
@@ -34,34 +34,8 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
#include <asm/dma.h>
+#include <asm/bfin_sport.h>
-struct sport_register {
- u16 tcr1; u16 reserved0;
- u16 tcr2; u16 reserved1;
- u16 tclkdiv; u16 reserved2;
- u16 tfsdiv; u16 reserved3;
- u32 tx;
- u32 reserved_l0;
- u32 rx;
- u32 reserved_l1;
- u16 rcr1; u16 reserved4;
- u16 rcr2; u16 reserved5;
- u16 rclkdiv; u16 reserved6;
- u16 rfsdiv; u16 reserved7;
- u16 stat; u16 reserved8;
- u16 chnl; u16 reserved9;
- u16 mcmc1; u16 reserved10;
- u16 mcmc2; u16 reserved11;
- u32 mtcs0;
- u32 mtcs1;
- u32 mtcs2;
- u32 mtcs3;
- u32 mrcs0;
- u32 mrcs1;
- u32 mrcs2;
- u32 mrcs3;
-};
-
#define DESC_ELEMENT_COUNT 9
struct sport_device {
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
