diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 12:02:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 12:02:23 +0200 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /arch/arm/plat-stmp3xxx/Makefile | |
| parent | pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kb... (diff) | |
| download | linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.xz linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'arch/arm/plat-stmp3xxx/Makefile')
| -rw-r--r-- | arch/arm/plat-stmp3xxx/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-stmp3xxx/Makefile b/arch/arm/plat-stmp3xxx/Makefile new file mode 100644 index 000000000000..31dd518f37a5 --- /dev/null +++ b/arch/arm/plat-stmp3xxx/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the linux kernel. +# +# Object file lists. +obj-y += core.o timer.o irq.o dma.o clock.o pinmux.o devices.o |