This must only have been build tested on sa-1100 hardware,
but the chip is also used on some pxa-25x boards.
- Dave
Build fixes for ohci-sa1111 with PXA ... it assumes SA-1100 CPUs,
but some PXA 255 boards use it too. (And minor whitespace fixes.)
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Index: pxa/drivers/usb/host/ohci-sa1111.c
===================================================================
--- pxa.orig/drivers/usb/host/ohci-sa1111.c 2006-07-30 18:10:20.000000000 -0700
+++ pxa/drivers/usb/host/ohci-sa1111.c 2006-07-30 19:51:20.000000000 -0700
@@ -4,7 +4,7 @@
* (C) Copyright 1999 Roman Weissgaerber <[EMAIL PROTECTED]>
* (C) Copyright 2000-2002 David Brownell <[EMAIL PROTECTED]>
* (C) Copyright 2002 Hewlett-Packard Company
- *
+ *
* SA1111 Bus Glue
*
* Written by Christopher Hoover <[EMAIL PROTECTED]>
@@ -12,17 +12,19 @@
*
* This file is licenced under the GPL.
*/
-
+
#include <asm/hardware.h>
#include <asm/mach-types.h>
+
+#ifdef CONFIG_SA1100
#include <asm/arch/assabet.h>
#include <asm/arch/badge4.h>
-#include <asm/hardware/sa1111.h>
-
-#ifndef CONFIG_SA1111
-#error "This file is SA-1111 bus glue. CONFIG_SA1111 must be defined."
+#else
+#define machine_has_neponset() 0
#endif
+#include <asm/hardware/sa1111.h>
+
extern int usb_disabled(void);
/*-------------------------------------------------------------------------*/
@@ -31,7 +33,7 @@ static void sa1111_start_hc(struct sa111
{
unsigned int usb_rst = 0;
- printk(KERN_DEBUG __FILE__
+ printk(KERN_DEBUG __FILE__
": starting SA-1111 OHCI USB Controller\n");
#ifdef CONFIG_SA1100_BADGE4
@@ -65,7 +67,7 @@ static void sa1111_start_hc(struct sa111
static void sa1111_stop_hc(struct sa1111_dev *dev)
{
unsigned int usb_rst;
- printk(KERN_DEBUG __FILE__
+ printk(KERN_DEBUG __FILE__
": stopping SA-1111 OHCI USB Controller\n");
/*
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
