Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ptp: Fix dp83640 build warning when building statically
  ptp: Added a clock driver for the National Semiconductor PHYTER.
  ptp: Added a clock driver for the IXP46x.
  ptp: Added a clock that uses the eTSEC found on the MPC85xx.
  ptp: Added a brand new class driver for ptp clocks.

diff --combined drivers/Makefile
index bceb60c,3c29601..6b17f58
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -64,10 -64,11 +64,10 @@@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe
  obj-$(CONFIG_PARIDE)          += block/paride/
  obj-$(CONFIG_TC)              += tc/
  obj-$(CONFIG_UWB)             += uwb/
 -obj-$(CONFIG_USB_OTG_UTILS)   += usb/otg/
 +obj-$(CONFIG_USB_OTG_UTILS)   += usb/
  obj-$(CONFIG_USB)             += usb/
 -obj-$(CONFIG_USB_MUSB_HDRC)   += usb/musb/
  obj-$(CONFIG_PCI)             += usb/
 -obj-$(CONFIG_USB_GADGET)      += usb/gadget/
 +obj-$(CONFIG_USB_GADGET)      += usb/
  obj-$(CONFIG_SERIO)           += input/serio/
  obj-$(CONFIG_GAMEPORT)                += input/gameport/
  obj-$(CONFIG_INPUT)           += input/
@@@ -75,6 -76,7 +75,7 @@@ obj-$(CONFIG_I2O)             += message
  obj-$(CONFIG_RTC_LIB)         += rtc/
  obj-y                         += i2c/ media/
  obj-$(CONFIG_PPS)             += pps/
+ obj-$(CONFIG_PTP_1588_CLOCK)  += ptp/
  obj-$(CONFIG_W1)              += w1/
  obj-$(CONFIG_POWER_SUPPLY)    += power/
  obj-$(CONFIG_HWMON)           += hwmon/
@@@ -94,7 -96,7 +95,7 @@@ obj-$(CONFIG_CPU_IDLE)                += cpuidle
  obj-$(CONFIG_DMA_ENGINE)      += dma/
  obj-$(CONFIG_MMC)             += mmc/
  obj-$(CONFIG_MEMSTICK)                += memstick/
 -obj-$(CONFIG_NEW_LEDS)                += leds/
 +obj-y                         += leds/
  obj-$(CONFIG_INFINIBAND)      += infiniband/
  obj-$(CONFIG_SGI_SN)          += sn/
  obj-y                         += firmware/

diff --combined include/linux/Kbuild
index cb1ded2,4585836..ccfedb4
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -302,6 -302,7 +302,7 @@@ header-y += ppp-comp.
  header-y += ppp_defs.h
  header-y += pps.h
  header-y += prctl.h
+ header-y += ptp_clock.h
  header-y += ptrace.h
  header-y += qnx4_fs.h
  header-y += qnxtypes.h
@@@ -372,7 -373,6 +373,7 @@@ header-y += unistd.
  header-y += usbdevice_fs.h
  header-y += utime.h
  header-y += utsname.h
 +header-y += uvcvideo.h
  header-y += v4l2-mediabus.h
  header-y += v4l2-subdev.h
  header-y += veth.h