Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[karo-tx-linux.git] / arch / arm / mach-omap1 / board-htcherald.c

diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index f2c5c585bc83cb1cc329f6474ee8dd20ebd99c6d..ba05a51f9408dfe308f66e0cb36a717c3101a745 100644 (file)
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -331,7 +331,7 @@ static struct resource htcpld_resources[] = {
        },
 };
 
-struct htcpld_chip_platform_data htcpld_chips[] = {
+static struct htcpld_chip_platform_data htcpld_chips[] = {
        [0] = {
                .addr           = 0x03,
                .reset          = 0x04,
@@ -366,7 +366,7 @@ struct htcpld_chip_platform_data htcpld_chips[] = {
        },
 };
 
-struct htcpld_core_platform_data htcpld_pfdata = {
+static struct htcpld_core_platform_data htcpld_pfdata = {
        .int_reset_gpio_hi = HTCPLD_GPIO_INT_RESET_HI,
        .int_reset_gpio_lo = HTCPLD_GPIO_INT_RESET_LO,
        .i2c_adapter_id    = 1,