Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b477dfba authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'fixes-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux

parents 1406de8e 3ac19bb4

arch/arm/mach-s3c2410/mach-bast.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -588,8 +588,6 @@ static void __init bast_map_io(void) 




	s3c_device_nand.dev.platform_data = &bast_nand_info;

	s3c_device_nand.dev.platform_data = &bast_nand_info;





	s3c_i2c0_set_platdata(&bast_i2c_info);



	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));

	s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));
@@ -602,6 +600,7 @@ static void __init bast_init(void) 
	sysdev_class_register(&bast_pm_sysclass);

	sysdev_class_register(&bast_pm_sysclass);

	sysdev_register(&bast_pm_sysdev);

	sysdev_register(&bast_pm_sysdev);





	s3c_i2c0_set_platdata(&bast_i2c_info);

	s3c24xx_fb_set_platdata(&bast_fb_info);

	s3c24xx_fb_set_platdata(&bast_fb_info);

	platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));

	platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));

arch/arm/nwfpe/fpa11.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -114,4 +114,8 @@ extern unsigned int SingleCPDO(struct roundingData *roundData, 
extern unsigned int DoubleCPDO(struct roundingData *roundData,

extern unsigned int DoubleCPDO(struct roundingData *roundData,

			       const unsigned int opcode, FPREG * rFd);

			       const unsigned int opcode, FPREG * rFd);





/* extneded_cpdo.c */

extern unsigned int ExtendedCPDO(struct roundingData *roundData,

				 const unsigned int opcode, FPREG * rFd);



#endif
 
#endif

arch/arm/nwfpe/fpa11_cprt.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -27,10 +27,6 @@ 
#include "fpmodule.inl"

#include "fpmodule.inl"

#include "softfloat.h"

#include "softfloat.h"





#ifdef CONFIG_FPE_NWFPE_XP

extern flag floatx80_is_nan(floatx80);

#endif



unsigned int PerformFLT(const unsigned int opcode);

unsigned int PerformFLT(const unsigned int opcode);

unsigned int PerformFIX(const unsigned int opcode);

unsigned int PerformFIX(const unsigned int opcode);

arch/arm/nwfpe/softfloat.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -226,6 +226,8 @@ char floatx80_le_quiet( floatx80, floatx80 ); 
char floatx80_lt_quiet( floatx80, floatx80 );

char floatx80_lt_quiet( floatx80, floatx80 );

char floatx80_is_signaling_nan( floatx80 );

char floatx80_is_signaling_nan( floatx80 );





extern flag floatx80_is_nan(floatx80);



#endif

#endif





static inline flag extractFloat32Sign(float32 a)

static inline flag extractFloat32Sign(float32 a)

arch/arm/plat-s3c/clock.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -306,8 +306,6 @@ struct clk s3c24xx_uclk = { 




int s3c24xx_register_clock(struct clk *clk)

int s3c24xx_register_clock(struct clk *clk)

{

{

	clk->owner = THIS_MODULE;



	if (clk->enable == NULL)

	if (clk->enable == NULL)

		clk->enable = clk_null_enable;

		clk->enable = clk_null_enable;