diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 10:11:38 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 10:11:38 +1100 |
| commit | 1263965f298af611d4992165242202eb194db1c1 (patch) | |
| tree | 625cbd9be60127a70619833e4e5f25a349d228da /arch/powerpc/sysdev/fsl_soc.h | |
| parent | 5006d1aae813727cc77cc56cca9e90ef748650ce (diff) | |
| parent | c0da99d5f7b0349cb11f970b3283c0d57beb5ec9 (diff) | |
| download | op-kernel-dev-1263965f298af611d4992165242202eb194db1c1.zip op-kernel-dev-1263965f298af611d4992165242202eb194db1c1.tar.gz | |
Merge commit 'kumar/kumar-next'
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.h')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h index 0242998..60f7f22 100644 --- a/arch/powerpc/sysdev/fsl_soc.h +++ b/arch/powerpc/sysdev/fsl_soc.h @@ -20,14 +20,7 @@ extern int fsl_spi_init(struct spi_board_info *board_infos, extern void fsl_rstcr_restart(char *cmd); #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) -#include <linux/bootmem.h> -#include <asm/rheap.h> struct platform_diu_data_ops { - rh_block_t diu_rh_block[16]; - rh_info_t diu_rh_info; - unsigned long diu_size; - void *diu_mem; - unsigned int (*get_pixel_format) (unsigned int bits_per_pixel, int monitor_port); void (*set_gamma_table) (int monitor_port, char *gamma_table_base); @@ -38,7 +31,6 @@ struct platform_diu_data_ops { }; extern struct platform_diu_data_ops diu_ops; -int __init preallocate_diu_videomemory(void); #endif #endif |
