diff --git a/[refs] b/[refs] index 4ed8100bd437..328405c0202b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88c36eb73e1e71ea3ca16896d6478a65d230b44a +refs/heads/master: e1719da689378de5c252ea0f51f5f76cc75fd629 diff --git a/trunk/arch/arm/mach-pxa/littleton.c b/trunk/arch/arm/mach-pxa/littleton.c index 9a4f51d48758..dd759d03a9fd 100644 --- a/trunk/arch/arm/mach-pxa/littleton.c +++ b/trunk/arch/arm/mach-pxa/littleton.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -106,11 +107,19 @@ static struct resource smc91x_resources[] = { } }; +static struct smc91x_platdata littleton_smc91x_info = { + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | + SMC91X_NOWAIT | SMC91X_USE_DMA, +}; + static struct platform_device smc91x_device = { .name = "smc91x", .id = 0, .num_resources = ARRAY_SIZE(smc91x_resources), .resource = smc91x_resources, + .dev = { + .platform_data = &littleton_smc91x_info, + }, }; #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h index 273f90ac2cb9..22209b6f1405 100644 --- a/trunk/drivers/net/smc91x.h +++ b/trunk/drivers/net/smc91x.h @@ -42,7 +42,8 @@ #if defined(CONFIG_ARCH_LUBBOCK) ||\ defined(CONFIG_MACH_MAINSTONE) ||\ - defined(CONFIG_MACH_ZYLONITE) + defined(CONFIG_MACH_ZYLONITE) ||\ + defined(CONFIG_MACH_LITTLETON) #include