diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2019-01-14 23:18:56 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-22 04:21:43 -0500 |
| commit | a156c7ba669c65b55c7afcc3994e1199cc0cad47 (patch) | |
| tree | b97c3343d57f59a026dbcac89060b3fcdbf4beb5 /drivers/video/fbdev | |
| parent | a084dbf6592c22468eb946014b2e731fb42da7a9 (diff) | |
powerpc: Replace nvram_* extern declarations with standard header
Remove the nvram_read_byte() and nvram_write_byte() declarations in
powerpc/include/asm/nvram.h and use the cross-platform static functions
in linux/nvram.h instead.
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/matrox/matroxfb_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c index 838869c6490c..0a4e5bad33f4 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.c +++ b/drivers/video/fbdev/matrox/matroxfb_base.c | |||
| @@ -111,12 +111,12 @@ | |||
| 111 | #include "matroxfb_g450.h" | 111 | #include "matroxfb_g450.h" |
| 112 | #include <linux/matroxfb.h> | 112 | #include <linux/matroxfb.h> |
| 113 | #include <linux/interrupt.h> | 113 | #include <linux/interrupt.h> |
| 114 | #include <linux/nvram.h> | ||
| 114 | #include <linux/slab.h> | 115 | #include <linux/slab.h> |
| 115 | #include <linux/uaccess.h> | 116 | #include <linux/uaccess.h> |
| 116 | 117 | ||
| 117 | #ifdef CONFIG_PPC_PMAC | 118 | #ifdef CONFIG_PPC_PMAC |
| 118 | #include <asm/machdep.h> | 119 | #include <asm/machdep.h> |
| 119 | unsigned char nvram_read_byte(int); | ||
| 120 | static int default_vmode = VMODE_NVRAM; | 120 | static int default_vmode = VMODE_NVRAM; |
| 121 | static int default_cmode = CMODE_NVRAM; | 121 | static int default_cmode = CMODE_NVRAM; |
| 122 | #endif | 122 | #endif |
