sugar/linux
1
0
Fork 0
Code Activity
Files
9871f1ad677d95ffeca80e2c21b70af9bfc9cc91
linux/drivers
History
Arnaud Patard (Rtp) 8b82f7c3c9 ixp4xx_eth: fix ptp_ixp46x build failure 
When building with ixp4xx_eth and ptp_ixp46x as module, one is getting the
following error:

ERROR: "ixp46x_phc_index" [drivers/ptp/ptp_ixp46x.ko] undefined!

This has been introduced by commit 509a7c2572.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-08-06 13:30:01 -07:00
..
accessibility
…
acpi
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
amba
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
ata
ata/pata_arasan: remove conditional compilation of clk code
2012-07-30 17:25:12 -07:00
atm
drivers/atm/iphase.c: fix error return code
2012-08-06 13:29:57 -07:00
auxdisplay
…
base
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
bcma
bcma: BCM43228 support
2012-08-02 13:51:46 -04:00
block
Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block
2012-08-01 09:06:47 -07:00
bluetooth
…
cdrom
…
char
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
clk
clk: validate pointer in __clk_disable()
2012-07-30 17:25:13 -07:00
clocksource
Merge tag 'newsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-07-23 16:31:31 -07:00
connector
…
cpufreq
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-07-30 09:45:53 -07:00
cpuidle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
crypto
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
edac
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
eisa
…
extcon
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-07-30 12:41:17 -07:00
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2012-07-30 09:32:39 -07:00
firmware
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
gpio
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-07-30 12:41:17 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-30 10:06:23 -07:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-31 18:47:44 -07:00
hsi
…
hv
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
hwmon
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2012-07-30 10:10:26 -07:00
hwspinlock
…
i2c
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
ide
…
idle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
ieee802154
…
iio
…
infiniband
Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
2012-07-30 07:47:27 -07:00
input
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
iommu
Merge tag 'iommu-updates-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-07-24 16:24:11 -07:00
isdn
mISDN: Bugfix for layer2 fixed TEI mode
2012-08-06 13:22:50 -07:00
leds
leds-lp8788: forgotten unlock at lp8788_led_work
2012-07-27 08:16:07 +08:00
lguest
…
macintosh
…
md
Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block
2012-08-01 09:06:47 -07:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-31 18:47:44 -07:00
memory
…
memstick
…
message
drivers/message/i2o/i2o_config.c: bound allocation
2012-07-30 17:25:17 -07:00
mfd
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
misc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
mmc
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
mtd
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
net
ixp4xx_eth: fix ptp_ixp46x build failure
2012-08-06 13:30:01 -07:00
nfc
…
nubus
…
of
Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux
2012-07-24 14:07:22 -07:00
oprofile
…
parisc
Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-07-24 16:17:07 -07:00
parport
…
pci
Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-07-24 16:17:07 -07:00
pcmcia
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
pinctrl
Merge tag 'pinctrl-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2012-07-24 14:05:46 -07:00
platform
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
pnp
…
power
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
pps
pps: return PTR_ERR on error in device_create
2012-07-30 17:25:21 -07:00
ps3
…
ptp
…
pwm
pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
2012-07-26 07:45:20 +02:00
rapidio
…
regulator
regulator: Fix an s5m8767 build failure
2012-07-31 00:51:09 +02:00
remoteproc
Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
2012-07-26 16:19:08 -07:00
rpmsg
Merge tag 'remoteproc-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
2012-07-26 16:19:08 -07:00
rtc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-26 18:09:01 -07:00
sbus
…
scsi
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
sfi
…
sh
…
sn
…
spi
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
ssb
…
staging
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
tc
…
thermal
Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6
2012-07-31 18:08:25 -07:00
tty
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
2012-07-31 19:07:42 -07:00
uio
…
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
uwb
…
vfio
vfio: Add PCI device driver
2012-07-31 08:16:24 -06:00
vhost
vhost: make vhost work queue visible
2012-07-22 01:22:23 +03:00
video
Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6
2012-08-01 10:45:12 -07:00
virt
…
virtio
…
vlynq
…
vme
…
w1
Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-07-26 11:25:33 -07:00
watchdog
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
xen
Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2012-07-24 16:17:07 -07:00
zorro
…
Kconfig
vfio: VFIO core
2012-07-31 08:16:22 -06:00
Makefile
vfio: VFIO core
2012-07-31 08:16:22 -06:00