Inter-revision diff: patch 12

Comparing v4 (message) to v5 (message)

--- v4
+++ v5
@@ -13,8 +13,7 @@
  drivers/staging/sm750fb/sm750_accel.c  |  4 ++--
  drivers/staging/sm750fb/sm750_cursor.c | 12 ++++++------
  drivers/staging/sm750fb/sm750_help.h   |  2 +-
- drivers/staging/sm750fb/sm750_hw.c     |  8 ++++----
- 7 files changed, 16 insertions(+), 16 deletions(-)
+ 6 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
 index 633201e..d7435d7 100644
@@ -56,7 +55,7 @@
  	do_div(numerator, psvalue);
  	return (unsigned long)numerator;
 diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c
-index 25dc15b..2ea447e 100644
+index afe73e8..0cfe96c 100644
 --- a/drivers/staging/sm750fb/sm750_accel.c
 +++ b/drivers/staging/sm750fb/sm750_accel.c
 @@ -414,10 +414,10 @@ int hw_imageblit(struct lynx_accel *accel,
@@ -143,46 +142,6 @@
  		return b-a;
  	else
  		return a-b;
-diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
-index 7a5d522..4941e2a 100644
---- a/drivers/staging/sm750fb/sm750_hw.c
-+++ b/drivers/staging/sm750fb/sm750_hw.c
-@@ -108,7 +108,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
- 	spec_share = container_of(share, struct sm750_share, share);
- 	parm = &spec_share->state.initParm;
- 	if (parm->chip_clk = 0)
--		parm->chip_clk = (getChipType() = SM750LE)?
-+		parm->chip_clk = (getChipType() = SM750LE) ?
- 						DEFAULT_SM750LE_CHIP_CLOCK :
- 						DEFAULT_SM750_CHIP_CLOCK;
- 
-@@ -421,7 +421,7 @@ void hw_sm750_crtc_clear(struct lynxfb_crtc* crtc)
- int hw_sm750_setColReg(struct lynxfb_crtc* crtc, ushort index,
- 								ushort red, ushort green, ushort blue)
- {
--	static unsigned int add[]={PANEL_PALETTE_RAM, CRT_PALETTE_RAM};
-+	static unsigned int add[] = {PANEL_PALETTE_RAM, CRT_PALETTE_RAM};
- 	POKE32(add[crtc->channel] + index*4, (red<<16)|(green<<8)|blue);
- 	return 0;
- }
-@@ -580,7 +580,7 @@ void hw_sm750_initAccel(struct lynx_share *share)
- 
- int hw_sm750le_deWait(void)
- {
--	int i=0x10000000;
-+	int i = 0x10000000;
- 	while (i--) {
- 		unsigned int dwVal = PEEK32(DE_STATE2);
- 		if ((FIELD_GET(dwVal, DE_STATE2, DE_STATUS) = DE_STATE2_DE_STATUS_IDLE) &&
-@@ -597,7 +597,7 @@ int hw_sm750le_deWait(void)
- 
- int hw_sm750_deWait(void)
- {
--	int i=0x10000000;
-+	int i = 0x10000000;
- 	while (i--) {
- 		unsigned int dwVal = PEEK32(SYSTEM_CTRL);
- 		if ((FIELD_GET(dwVal, SYSTEM_CTRL, DE_STATUS) = SYSTEM_CTRL_DE_STATUS_IDLE) &&
 -- 
-2.4.4
+2.4.5
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help