diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 18:49:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 18:49:10 -0400 |
| commit | 117494a1b65183f0e3fcc817b07944bc5c465050 (patch) | |
| tree | c375cf06bdf869f2b870fe61808b060c4fadab45 /arch/blackfin | |
| parent | 4d5709a7b7d54fc5882d2943a14988a92d48c00a (diff) | |
| parent | d1aa3e6aa8edfeb864af7c930523d9e588b28bea (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits)
USB: fix race in autosuspend reschedule
atmel_usba_udc: Keep track of the device status
USB: Nikon D40X unusual_devs entry
USB: serial core should respect driver requirements
USB: documentation for USB power management
USB: skip autosuspended devices during system resume
USB: mutual exclusion for EHCI init and port resets
USB: allow usbstorage to have LUNS greater than 2Tb
USB: Adding support for SHARP WS011SH to ipaq.c
USB: add atmel_usba_udc driver
USB: ohci SSB bus glue
USB: ehci build fixes on au1xxx, ppc-soc
USB: add runtime frame_no quirk for big-endian OHCI
USB: funsoft: Fix termios
USB: visor: termios bits
USB: unusual_devs entry for Nikon DSC D2Xs
USB: re-remove <linux/usb_sl811.h>
USB: move <linux/usb_gadget.h> to <linux/usb/gadget.h>
USB: Export URB statistics for powertop
USB: serial gadget: Disable endpoints on unload
...
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index 5e9d09eb8579..6668c8e4a3fc 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/pata_platform.h> | 40 | #include <linux/pata_platform.h> |
| 41 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
| 42 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
| 43 | #include <linux/usb_sl811.h> | 43 | #include <linux/usb/sl811.h> |
| 44 | #include <asm/dma.h> | 44 | #include <asm/dma.h> |
| 45 | #include <asm/bfin5xx_spi.h> | 45 | #include <asm/bfin5xx_spi.h> |
| 46 | #include <asm/reboot.h> | 46 | #include <asm/reboot.h> |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 20507e92a3a4..f83a2544004d 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/irq.h> | 40 | #include <linux/irq.h> |
| 41 | #include <asm/dma.h> | 41 | #include <asm/dma.h> |
| 42 | #include <asm/bfin5xx_spi.h> | 42 | #include <asm/bfin5xx_spi.h> |
| 43 | #include <linux/usb_sl811.h> | 43 | #include <linux/usb/sl811.h> |
| 44 | 44 | ||
| 45 | #include <linux/spi/ad7877.h> | 45 | #include <linux/spi/ad7877.h> |
| 46 | 46 | ||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 47d7d4a0e73d..f42ba3aa86d7 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/pata_platform.h> | 40 | #include <linux/pata_platform.h> |
| 41 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
| 42 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
| 43 | #include <linux/usb_sl811.h> | 43 | #include <linux/usb/sl811.h> |
| 44 | #include <asm/dma.h> | 44 | #include <asm/dma.h> |
| 45 | #include <asm/bfin5xx_spi.h> | 45 | #include <asm/bfin5xx_spi.h> |
| 46 | #include <asm/reboot.h> | 46 | #include <asm/reboot.h> |