diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:43:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:43:31 -0700 |
commit | 5170065d8af2c102ca940303416579606bc7ff51 (patch) | |
tree | cdf113cb04be06d0d3afc8df06acc628208dbcdd /include/linux | |
parent | ab8e823515305a93715e71b81efcbe27c6ce0f59 (diff) | |
parent | c4710e65c005339b5979fa258bf89940dc2a700b (diff) | |
download | op-kernel-dev-5170065d8af2c102ca940303416579606bc7ff51.zip op-kernel-dev-5170065d8af2c102ca940303416579606bc7ff51.tar.gz |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Remove remaining reference to ite_gpio.h from Kbuild
[MIPS] PNX8550 fixups
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index ea005c0..5114ff1 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -100,7 +100,6 @@ header-y += ipx.h header-y += irda.h header-y += isdn_divertif.h header-y += iso_fs.h -header-y += ite_gpio.h header-y += ixjuser.h header-y += jffs2.h header-y += keyctl.h |