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

Commit 90590543 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Bob Liu
Browse files

blackfin: Fixup export.h includes 



Commit 8dc7a9c8 ("blackfin: Add export.h to files using
EXPORT_SYMBOL/THIS_MODULE") inserted some of the include statements into
sections protected by an unrelated #if CONFIG_... statement. This can cause,
depending on the configuration used, warnings like this one:

	arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: data definition has no type or storage class
	arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’
	arch/blackfin/mach-bf537/boards/stamp.c:2940: warning: parameter names (without types) in function declaration

This patch fixes it by moving the includes out of the #if protected sections.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent edb0a640

arch/blackfin/mach-bf527/boards/cm_bf527.c

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/device.h>

#include <linux/export.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -811,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = { 
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/export.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},

arch/blackfin/mach-bf527/boards/ezbrd.c

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/device.h>

#include <linux/export.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -684,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = { 
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/export.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},

arch/blackfin/mach-bf537/boards/cm_bf537e.c

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/device.h>

#include <linux/export.h>

#include <linux/etherdevice.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>
@@ -579,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = { 


#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#include <linux/bfin_mac.h>

#include <linux/export.h>

static const unsigned short bfin_mac_peripherals[] = P_MII0;



static struct bfin_phydev_platform_data bfin_phydev_data[] = {

arch/blackfin/mach-bf537/boards/cm_bf537u.c

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/device.h>

#include <linux/etherdevice.h>

#include <linux/export.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -544,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = { 


#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#include <linux/bfin_mac.h>

#include <linux/export.h>

static const unsigned short bfin_mac_peripherals[] = P_MII0;



static struct bfin_phydev_platform_data bfin_phydev_data[] = {

arch/blackfin/mach-bf537/boards/dnp5370.c

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include <linux/device.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/io.h>
@@ -49,7 +50,6 @@ static struct platform_device rtc_device = { 


#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#include <linux/bfin_mac.h>

#include <linux/export.h>

static const unsigned short bfin_mac_peripherals[] = P_RMII0;



static struct bfin_phydev_platform_data bfin_phydev_data[] = {