diff options
| -rw-r--r-- | drivers/staging/sm750fb/sm750.c | 2 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/sm750.h | 2 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/sm750_hw.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index d74836fbdfa3..6a6b48254af8 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -609,7 +609,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par) hw_sm750le_setBLANK : hw_sm750_setBLANK; /* chip specific phase */ sm750_dev->accel.de_wait = (sm750_dev->revid == SM750LE_REVISION_ID) ? - hw_sm750le_deWait : hw_sm750_deWait; + hw_sm750le_deWait : hw_sm750_de_wait; switch (sm750_dev->dataflow) { case sm750_simul_pri: output->paths = sm750_pnc; diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index a797985a4df7..e24ec6a9799e 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -194,7 +194,7 @@ static inline unsigned long ps_to_hz(unsigned int psvalue) int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev); int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev); void hw_sm750_init_accel(struct sm750_dev *sm750_dev); -int hw_sm750_deWait(void); +int hw_sm750_de_wait(void); int hw_sm750le_deWait(void); int hw_sm750_output_setMode(struct lynxfb_output *output, diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index a5bb067b30cc..5a6ee02bb95f 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -521,7 +521,7 @@ int hw_sm750le_deWait(void) return -1; } -int hw_sm750_deWait(void) +int hw_sm750_de_wait(void) { int i = 0x10000000; unsigned int mask = SYSTEM_CTRL_DE_STATUS_BUSY | |