git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
common
/
platform.c
diff --git
a/arch/mips/au1000/common/platform.c
b/arch/mips/au1000/common/platform.c
index
1f7b465
..
8fd203d
100644
(file)
--- a/
arch/mips/au1000/common/platform.c
+++ b/
arch/mips/au1000/common/platform.c
@@
-7,8
+7,8
@@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#include <linux/config.h>
#include <linux/device.h>
#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/resource.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/resource.h>
@@
-19,7
+19,7
@@
static struct resource au1xxx_usb_ohci_resources[] = {
[0] = {
.start = USB_OHCI_BASE,
static struct resource au1xxx_usb_ohci_resources[] = {
[0] = {
.start = USB_OHCI_BASE,
- .end = USB_OHCI_BASE + USB_OHCI_LEN,
+ .end = USB_OHCI_BASE + USB_OHCI_LEN
- 1
,
.flags = IORESOURCE_MEM,
},
[1] = {
.flags = IORESOURCE_MEM,
},
[1] = {
@@
-263,7
+263,7
@@
static struct resource smc91x_resources[] = {
static struct platform_device smc91x_device = {
.name = "smc91x",
static struct platform_device smc91x_device = {
.name = "smc91x",
- .id = -1,
+ .id = -1,
.num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources,
};
.num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources,
};
@@
-277,9
+277,7
@@
static struct platform_device *au1xxx_platform_devices[] __initdata = {
&au1100_lcd_device,
#endif
#ifdef CONFIG_SOC_AU1200
&au1100_lcd_device,
#endif
#ifdef CONFIG_SOC_AU1200
-#if 0 /* fixme */
&au1xxx_usb_ehci_device,
&au1xxx_usb_ehci_device,
-#endif
&au1xxx_usb_gdt_device,
&au1xxx_usb_otg_device,
&au1200_lcd_device,
&au1xxx_usb_gdt_device,
&au1xxx_usb_otg_device,
&au1200_lcd_device,
@@
-287,7
+285,7
@@
static struct platform_device *au1xxx_platform_devices[] __initdata = {
&au1xxx_mmc_device,
#endif
#ifdef CONFIG_MIPS_DB1200
&au1xxx_mmc_device,
#endif
#ifdef CONFIG_MIPS_DB1200
- &smc91x_device,
+ &smc91x_device,
#endif
};
#endif
};