Diff
Modified: trunk/arch/blackfin/include/asm/bfin-lq035q1.h (8421 => 8422)
--- trunk/arch/blackfin/include/asm/bfin-lq035q1.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/include/asm/bfin-lq035q1.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -31,7 +31,7 @@
struct bfin_lq035q1fb_disp_info {
unsigned mode;
- unsigned ppi_mode;
+ unsigned ppi_mode;
/* GPIOs */
int use_bl;
unsigned gpio_bl;
Modified: trunk/arch/blackfin/include/asm/irq.h (8421 => 8422)
--- trunk/arch/blackfin/include/asm/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/include/asm/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -13,7 +13,7 @@
#include <linux/irqflags.h>
/* IRQs that may be used by external irq_chip controllers */
-#define NR_SPARE_IRQS 32
+#define NR_SPARE_IRQS 32
#include <mach/anomaly.h>
Modified: trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c (8421 => 8422)
--- trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c 2010-03-09 04:07:48 UTC (rev 8422)
@@ -149,11 +149,11 @@
.y_plate_ohms = 486,
.pressure_max = 1000,
.pressure_min = 0,
- .stopacq_polarity = 1,
- .first_conversion_delay = 3,
- .acquisition_time = 1,
- .averaging = 1,
- .pen_down_acc_interval = 1,
+ .stopacq_polarity = 1,
+ .first_conversion_delay = 3,
+ .acquisition_time = 1,
+ .averaging = 1,
+ .pen_down_acc_interval = 1,
};
#endif
Modified: trunk/arch/blackfin/mach-bf518/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf518/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf518/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -161,7 +161,7 @@
#define IRQ_MAC_STMDONE 126 /* Station Mgt. Transfer Done Interrupt */
#define NR_MACH_IRQS (IRQ_MAC_STMDONE + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (8421 => 8422)
--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2010-03-09 04:07:48 UTC (rev 8422)
@@ -278,7 +278,7 @@
.median = 2, /* do 8 measurements */
.averaging = 1, /* take the average of 4 middle samples */
.pen_down_acc_interval = 255, /* 9.4 ms */
- .gpio_export = 1, /* Export GPIO to gpiolib */
+ .gpio_export = 1, /* Export GPIO to gpiolib */
.gpio_base = -1, /* Dynamic allocation */
};
#endif
Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (8421 => 8422)
--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2010-03-09 04:07:48 UTC (rev 8422)
@@ -480,7 +480,7 @@
.median = 2, /* do 8 measurements */
.averaging = 1, /* take the average of 4 middle samples */
.pen_down_acc_interval = 255, /* 9.4 ms */
- .gpio_export = 0, /* Export GPIO to gpiolib */
+ .gpio_export = 0, /* Export GPIO to gpiolib */
};
#endif
Modified: trunk/arch/blackfin/mach-bf527/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf527/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf527/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -161,7 +161,7 @@
#define IRQ_MAC_STMDONE 126 /* Station Mgt. Transfer Done Interrupt */
#define NR_MACH_IRQS (IRQ_MAC_STMDONE + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf533/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf533/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf533/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -105,7 +105,7 @@
#define GPIO_IRQ_BASE IRQ_PF0
#define NR_MACH_IRQS (IRQ_PF15 + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf537/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf537/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf537/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -144,7 +144,7 @@
#define IRQ_MAC_STMDONE 105 /* Station Mgt. Transfer Done Interrupt */
#define NR_MACH_IRQS (IRQ_MAC_STMDONE + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf538/boards/ezkit.c (8421 => 8422)
--- trunk/arch/blackfin/mach-bf538/boards/ezkit.c 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf538/boards/ezkit.c 2010-03-09 04:07:48 UTC (rev 8422)
@@ -518,7 +518,7 @@
.median = 2, /* do 8 measurements */
.averaging = 1, /* take the average of 4 middle samples */
.pen_down_acc_interval = 255, /* 9.4 ms */
- .gpio_export = 1, /* Export GPIO to gpiolib */
+ .gpio_export = 1, /* Export GPIO to gpiolib */
.gpio_base = -1, /* Dynamic allocation */
};
#endif
Modified: trunk/arch/blackfin/mach-bf538/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf538/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf538/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -111,7 +111,7 @@
#define GPIO_IRQ_BASE IRQ_PF0
#define NR_MACH_IRQS (IRQ_PF15 + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf548/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf548/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf548/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -318,7 +318,7 @@
#define GPIO_IRQ_BASE IRQ_PA0
#define NR_MACH_IRQS (IRQ_PJ15 + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
/* For compatibility reasons with existing code */
Modified: trunk/arch/blackfin/mach-bf561/include/mach/irq.h (8421 => 8422)
--- trunk/arch/blackfin/mach-bf561/include/mach/irq.h 2010-03-09 04:05:39 UTC (rev 8421)
+++ trunk/arch/blackfin/mach-bf561/include/mach/irq.h 2010-03-09 04:07:48 UTC (rev 8422)
@@ -266,7 +266,7 @@
#define GPIO_IRQ_BASE IRQ_PF0
#define NR_MACH_IRQS (IRQ_PF47 + 1)
-#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
