diff options
Diffstat (limited to 'arch/parisc/kernel/hardware.c')
| -rw-r--r-- | arch/parisc/kernel/hardware.c | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c index f48a640b55fb..f7752f6af29e 100644 --- a/arch/parisc/kernel/hardware.c +++ b/arch/parisc/kernel/hardware.c @@ -38,7 +38,7 @@   *	so don't reference this table after starting the init process   */ -static struct hp_hardware hp_hardware_list[] __devinitdata = { +static struct hp_hardware hp_hardware_list[] = {  	{HPHW_NPROC,0x01,0x4,0x0,"Indigo (840, 930)"},  	{HPHW_NPROC,0x8,0x4,0x01,"Firefox(825,925)"},  	{HPHW_NPROC,0xA,0x4,0x01,"Top Gun (835,834,935,635)"}, @@ -1230,7 +1230,7 @@ static struct hp_cpu_type_mask {  	unsigned short model;  	unsigned short mask;  	enum cpu_type cpu; -} hp_cpu_type_mask_list[] __devinitdata = { +} hp_cpu_type_mask_list[] = {  	{ 0x0000, 0x0ff0, pcx    },  /* 0x0000 - 0x000f */  	{ 0x0048, 0x0ff0, pcxl   },  /* 0x0040 - 0x004f */ @@ -1327,8 +1327,7 @@ const char * const cpu_name_version[][2] = {  	[mako2] = { "PA8900 (Shortfin)",	"2.0" }  }; -const char * __devinit -parisc_hardware_description(struct parisc_device_id *id) +const char *parisc_hardware_description(struct parisc_device_id *id)  {  	struct hp_hardware *listptr; | 
