diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-04 22:16:48 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-04 22:16:48 -0500 |
commit | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (patch) | |
tree | d327446284dcce52ad3ea54ffe8a7dddfcb8b86d /arch/powerpc/platforms/83xx/mpc837x_mds.c | |
parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
parent | 068e8c9d02ee37c44a4d65279b3ae8188fb09e18 (diff) |
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc837x_mds.c')
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c index 8bb13c807142..530ef990ca7c 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #define BCSR12_USB_SER_MASK 0x8a | 26 | #define BCSR12_USB_SER_MASK 0x8a |
27 | #define BCSR12_USB_SER_PIN 0x80 | 27 | #define BCSR12_USB_SER_PIN 0x80 |
28 | #define BCSR12_USB_SER_DEVICE 0x02 | 28 | #define BCSR12_USB_SER_DEVICE 0x02 |
29 | extern int mpc837x_usb_cfg(void); | ||
30 | 29 | ||
31 | static int mpc837xmds_usb_cfg(void) | 30 | static int mpc837xmds_usb_cfg(void) |
32 | { | 31 | { |