diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 21:00:50 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 21:00:50 +0400 |
commit | 0c4ea957c6ec953d84cc07346437abe0ae4bb57d (patch) | |
tree | aea0141a8afb37743604aa909c6ea7362367ae25 /arch/mips/sgi-ip22/Makefile | |
parent | f2c60ed038dedcc43a0eb3ef4e0602741ba90384 (diff) | |
parent | df9f54084f1faf611cedd846d38b0631f9d4e9a5 (diff) | |
download | linux-0c4ea957c6ec953d84cc07346437abe0ae4bb57d.tar.xz |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22:
Convert SGI IP22 and specific drivers to platform_device.
Diffstat (limited to 'arch/mips/sgi-ip22/Makefile')
-rw-r--r-- | arch/mips/sgi-ip22/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/Makefile b/arch/mips/sgi-ip22/Makefile index b6d649241dc1..1fb3e353e212 100644 --- a/arch/mips/sgi-ip22/Makefile +++ b/arch/mips/sgi-ip22/Makefile @@ -4,6 +4,6 @@ # obj-y += ip22-mc.o ip22-hpc.o ip22-int.o ip22-berr.o \ - ip22-time.o ip22-nvram.o ip22-reset.o ip22-setup.o + ip22-time.o ip22-nvram.o ip22-platform.o ip22-reset.o ip22-setup.o obj-$(CONFIG_EISA) += ip22-eisa.o |