Tony Lindgren
eb6b0b1832
ARM: OMAP: No need to include board-h2.h from hardware.h
...
Also move board-h2.h to mach-omap1.
Signed-off-by: Tony Lindgren <tony@atomide.com>
2009-03-23 18:07:33 -07:00
Tony Lindgren
d9558b19f2
ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h
...
Move defines to the board file and remove the now
unnecessary headers.
Signed-off-by: Tony Lindgren <tony@atomide.com>
2009-03-23 18:07:32 -07:00
Hiroshi DOYU
8dff0fa55d
omap mailbox: remove unnecessary header file inclusion
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:32 -07:00
Hiroshi DOYU
7a781afde6
omap mailbox: convert sequence bit checking to module paramter
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:31 -07:00
Hiroshi DOYU
9ae0ee0076
omap mailbox: move mailbox.h into mailbox.c
...
no need to keep mailbox.h separately.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:26 -07:00
Hiroshi DOYU
c75ee7520b
omap mailbox: add save_/restore_ctx() for PM
...
To preserve the registers during off-mode
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:26 -07:00
Hiroshi DOYU
da8cfe03a4
omap mailbox: fix empty struct device for omap2
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:25 -07:00
Hiroshi DOYU
f98d67a07e
omap mailbox: fix empty struct device for omap1
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:25 -07:00
Hiroshi DOYU
f48cca8770
omap mailbox: fix empty struct device for omap_mbox
...
Since "mbox->dev" doesn't exist and isn't created either at
registration, this patch will create "struct device", which belongs to
"omap-mailbox" class and set this pointer for the member of
"struct omap_mbox".
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:24 -07:00
Hiroshi DOYU
94fc58c6da
omap mailbox: print hardware revision at startup
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:24 -07:00
Hiroshi DOYU
6c20a68372
omap mailbox: add initial omap3 support
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:23 -07:00
Hiroshi DOYU
733ecc5c06
omap mailbox: cleanup omap2 register definition with macro
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:23 -07:00
James Morris
703a3cd728
Merge branch 'master' into next
2009-03-24 10:52:46 +11:00
Takashi Iwai
c441c2971d
Merge branch 'topic/usb-caiaq' into for-linus
2009-03-24 00:36:23 +01:00
Takashi Iwai
afad17c0ae
Merge branch 'topic/usb-audio' into for-linus
2009-03-24 00:36:22 +01:00
Takashi Iwai
d080732334
Merge branch 'topic/sscape-fix' into for-linus
2009-03-24 00:36:21 +01:00
Takashi Iwai
d7b6df5d1a
Merge branch 'topic/powermac' into for-linus
2009-03-24 00:36:20 +01:00
Takashi Iwai
7df4f69435
Merge branch 'topic/pcxhr' into for-linus
2009-03-24 00:36:19 +01:00
Takashi Iwai
b54fc8dd2c
Merge branch 'topic/oxygen' into for-linus
2009-03-24 00:36:17 +01:00
Takashi Iwai
9fb5430c3d
Merge branch 'topic/oss-fix' into for-linus
2009-03-24 00:36:16 +01:00
Takashi Iwai
4c5ecb7e59
Merge branch 'topic/msnd' into for-linus
2009-03-24 00:36:15 +01:00
Takashi Iwai
fa15fdeffa
Merge branch 'topic/isa-misc' into for-linus
2009-03-24 00:36:13 +01:00
Takashi Iwai
843ad02fa4
Merge branch 'topic/intel8x0' into for-linus
2009-03-24 00:36:13 +01:00
Takashi Iwai
60c4e7c120
Merge branch 'topic/ice' into for-linus
2009-03-24 00:36:12 +01:00
Takashi Iwai
593aff6c50
Merge branch 'topic/hdsp' into for-linus
2009-03-24 00:36:10 +01:00
Takashi Iwai
e7bfbb0215
Merge branch 'topic/hda' into for-linus
2009-03-24 00:36:09 +01:00
Takashi Iwai
fe506d6bc5
Merge branch 'topic/emu10k1' into for-linus
2009-03-24 00:36:08 +01:00
Takashi Iwai
c9294e4b37
Merge branch 'topic/echoaudio' into for-linus
2009-03-24 00:36:07 +01:00
Takashi Iwai
ae02cde7e9
Merge branch 'topic/drop-l3' into for-linus
2009-03-24 00:36:05 +01:00
Takashi Iwai
f11a936fe7
Merge branch 'topic/docbook-fix' into for-linus
2009-03-24 00:36:02 +01:00
Takashi Iwai
a3c6048dcf
Merge branch 'topic/cs423x-merge' into for-linus
2009-03-24 00:35:59 +01:00
Takashi Iwai
87cd9d7c85
Merge branch 'topic/ca0106' into for-linus
2009-03-24 00:35:58 +01:00
Takashi Iwai
158c1529fe
Merge branch 'topic/atmel' into for-linus
2009-03-24 00:35:56 +01:00
Takashi Iwai
b5c784894c
Merge branch 'topic/asoc' into for-linus
2009-03-24 00:35:53 +01:00
Takashi Iwai
ff4fc3656e
Merge branch 'topic/aoa' into for-linus
2009-03-24 00:35:51 +01:00
Takashi Iwai
e0d2054fd3
Merge branch 'topic/misc' into for-linus
2009-03-24 00:35:50 +01:00
Takashi Iwai
d807500a24
Merge branch 'topic/pcm-cleanup' into for-linus
2009-03-24 00:35:49 +01:00
Takashi Iwai
c7ccfd060f
Merge branch 'topic/ioctl-use-define' into for-linus
2009-03-24 00:35:48 +01:00
Takashi Iwai
ec6659c389
Merge branch 'topic/vmaster-update' into for-linus
2009-03-24 00:35:47 +01:00
Takashi Iwai
c944a93df0
Merge branch 'topic/rawmidi-fix' into for-linus
2009-03-24 00:35:46 +01:00
Takashi Iwai
65b3864b85
Merge branch 'topic/ctl-list-cleanup' into for-linus
2009-03-24 00:35:45 +01:00
Takashi Iwai
bafdb7278c
Merge branch 'topic/quirk-cleanup' into for-linus
2009-03-24 00:35:44 +01:00
Takashi Iwai
5b56eec774
Merge branch 'topic/jack' into for-linus
2009-03-24 00:35:43 +01:00
Takashi Iwai
c2f43981e5
Merge branch 'topic/hwdep-cleanup' into for-linus
2009-03-24 00:35:41 +01:00
Takashi Iwai
dec14f8c0e
Merge branch 'topic/snd_card_new-err' into for-linus
2009-03-24 00:35:35 +01:00
David S. Miller
039a6f6a39
ucc_geth: Fix merge error.
...
I left a merge failure unresolved, noticed by Stephen
Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-23 16:21:16 -07:00
Linus Torvalds
8e0ee43bc2
Linux 2.6.29
2009-03-23 16:12:14 -07:00
Chris Dearman
9fb4c2b9e0
MIPS: R2: Fix problem with code that incorrectly modifies ebase.
...
Commit 566f74f6b2
2009-03-23 23:38:05 +01:00
Ralf Baechle
89e18eb331
MIPS: Change {set,clear,change}_c0_<foo> to return old value.
...
This is more standard and useful and need for the following fix to work
correctly.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:05 +01:00
Huang Weiyi
5484879c0a
MIPS: compat: Remove duplicated #include
...
Remove duplicated #include in arch/mips/kernel/linux32.c.
Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:05 +01:00
